fixed downloads delete dialogs not showing
also fixed certain files not getting recognized in the filesystem and giving a false negative on downloads tab, making them grey made grey downloads' buttons grey too switched the button to materialbutton like home replaced basic progressbar to linearprogress. Now progress is buttery smooth
This commit is contained in:
parent
3936e83578
commit
b5119e8b4e
13 changed files with 90 additions and 45 deletions
|
|
@ -320,7 +320,7 @@
|
||||||
<PersistentState>
|
<PersistentState>
|
||||||
<option name="values">
|
<option name="values">
|
||||||
<map>
|
<map>
|
||||||
<entry key="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/icons/material/materialiconsoutlined/cloud_download/outline_cloud_download_24.xml" />
|
<entry key="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/icons/material/materialicons/filter_list/baseline_filter_list_24.xml" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
</PersistentState>
|
</PersistentState>
|
||||||
|
|
@ -331,7 +331,7 @@
|
||||||
<option name="values">
|
<option name="values">
|
||||||
<map>
|
<map>
|
||||||
<entry key="color" value="00a6ff" />
|
<entry key="color" value="00a6ff" />
|
||||||
<entry key="outputName" value="ic_outline_cloud_download_24" />
|
<entry key="outputName" value="ic_filter" />
|
||||||
<entry key="sourceFile" value="C:\Users\denis\Desktop\adaptiveproduct_youtube_foreground_color_108 (1).svg" />
|
<entry key="sourceFile" value="C:\Users\denis\Desktop\adaptiveproduct_youtube_foreground_color_108 (1).svg" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,7 @@
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_down.xml" value="0.109" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_down.xml" value="0.109" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_download.xml" value="0.1275" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_download.xml" value="0.1275" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_downloads.xml" value="0.2395" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_downloads.xml" value="0.2395" />
|
||||||
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_filter.xml" value="0.1965" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_go_up.xml" value="0.1275" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_go_up.xml" value="0.1275" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_home.xml" value="0.1275" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_home.xml" value="0.1275" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_image.xml" value="0.109" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/drawable/ic_image.xml" value="0.109" />
|
||||||
|
|
@ -85,6 +86,7 @@
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_bottom_sheet.xml" value="0.16875" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_bottom_sheet.xml" value="0.16875" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_card.xml" value="0.33" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_card.xml" value="0.33" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_card_shimmer.xml" value="0.33" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_card_shimmer.xml" value="0.33" />
|
||||||
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_filter_sheet.xml" value="0.33" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_no_results.xml" value="0.21" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/history_no_results.xml" value="0.21" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/home_download_all_bottom_sheet.xml" value="0.33" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/home_download_all_bottom_sheet.xml" value="0.33" />
|
||||||
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/home_video_bottom_sheet.xml" value="0.1703125" />
|
<entry key="..\:/Users/denis/Documents/GitHub/ytdlnis/app/src/main/res/layout/home_video_bottom_sheet.xml" value="0.1703125" />
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package com.deniscerri.ytdlnis.adapter;
|
package com.deniscerri.ytdlnis.adapter;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.content.res.ColorStateList;
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.graphics.ColorMatrix;
|
import android.graphics.ColorMatrix;
|
||||||
import android.graphics.ColorMatrixColorFilter;
|
import android.graphics.ColorMatrixColorFilter;
|
||||||
|
|
@ -21,6 +22,7 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.deniscerri.ytdlnis.R;
|
import com.deniscerri.ytdlnis.R;
|
||||||
import com.deniscerri.ytdlnis.database.Video;
|
import com.deniscerri.ytdlnis.database.Video;
|
||||||
|
import com.google.android.material.button.MaterialButton;
|
||||||
import com.squareup.picasso.Picasso;
|
import com.squareup.picasso.Picasso;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
@ -91,21 +93,33 @@ public class HistoryRecyclerViewAdapter extends RecyclerView.Adapter<HistoryRecy
|
||||||
String downloadedTime = video.getDownloadedTime();
|
String downloadedTime = video.getDownloadedTime();
|
||||||
datetime.setText(downloadedTime);
|
datetime.setText(downloadedTime);
|
||||||
|
|
||||||
// BUTTON ----------------------------------
|
//IS IN THE FILE SYSTEM?
|
||||||
LinearLayout buttonLayout = card.findViewById(R.id.history_download_button_layout);
|
String path = video.getDownloadPath();
|
||||||
Button btn = buttonLayout.findViewById(R.id.history_download_button_type);
|
File file = new File(path);
|
||||||
if(video.getDownloadedType().equals("audio") || video.getDownloadedType().equals("mp3")){
|
boolean filePresent = true;
|
||||||
btn.setBackground(ContextCompat.getDrawable(context, R.drawable.ic_music));
|
if(!file.exists() && !path.isEmpty()){
|
||||||
}else{
|
filePresent = false;
|
||||||
btn.setBackground(ContextCompat.getDrawable(context, R.drawable.ic_video));
|
|
||||||
}
|
|
||||||
|
|
||||||
File file = new File(video.getDownloadPath());
|
|
||||||
if(!file.exists()){
|
|
||||||
thumbnail.setColorFilter(new ColorMatrixColorFilter(new ColorMatrix(){{setSaturation(0f);}}));
|
thumbnail.setColorFilter(new ColorMatrixColorFilter(new ColorMatrix(){{setSaturation(0f);}}));
|
||||||
thumbnail.setAlpha(0.7f);
|
thumbnail.setAlpha(0.7f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BUTTON ----------------------------------
|
||||||
|
LinearLayout buttonLayout = card.findViewById(R.id.history_download_button_layout);
|
||||||
|
MaterialButton btn = buttonLayout.findViewById(R.id.history_download_button_type);
|
||||||
|
if(video.getDownloadedType().equals("audio")){
|
||||||
|
if (filePresent) btn.setIcon(ContextCompat.getDrawable(context, R.drawable.ic_music_downloaded));
|
||||||
|
else {
|
||||||
|
btn.setIcon(ContextCompat.getDrawable(context, R.drawable.ic_music));
|
||||||
|
btn.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#707a7e")));
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if (filePresent) btn.setIcon(ContextCompat.getDrawable(context, R.drawable.ic_video_downloaded));
|
||||||
|
else {
|
||||||
|
btn.setIcon(ContextCompat.getDrawable(context, R.drawable.ic_video));
|
||||||
|
btn.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#707a7e")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
card.setOnClickListener(view -> onItemClickListener.onCardClick(position));
|
card.setOnClickListener(view -> onItemClickListener.onCardClick(position));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,17 +10,15 @@ import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.ProgressBar;
|
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.deniscerri.ytdlnis.R;
|
import com.deniscerri.ytdlnis.R;
|
||||||
import com.deniscerri.ytdlnis.database.Video;
|
import com.deniscerri.ytdlnis.database.Video;
|
||||||
import com.google.android.material.button.MaterialButton;
|
import com.google.android.material.button.MaterialButton;
|
||||||
import com.google.android.material.card.MaterialCardView;
|
import com.google.android.material.card.MaterialCardView;
|
||||||
|
import com.google.android.material.progressindicator.LinearProgressIndicator;
|
||||||
import com.squareup.picasso.Picasso;
|
import com.squareup.picasso.Picasso;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
@ -105,7 +103,7 @@ public class HomeRecyclerViewAdapter extends RecyclerView.Adapter<HomeRecyclerVi
|
||||||
|
|
||||||
// PROGRESS BAR ----------------------------------------------------
|
// PROGRESS BAR ----------------------------------------------------
|
||||||
|
|
||||||
ProgressBar progressBar = card.findViewById(R.id.download_progress);
|
LinearProgressIndicator progressBar = card.findViewById(R.id.download_progress);
|
||||||
progressBar.setVisibility(View.GONE);
|
progressBar.setVisibility(View.GONE);
|
||||||
progressBar.setTag(videoID + "##progress");
|
progressBar.setTag(videoID + "##progress");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ public class HistoryFragment extends Fragment implements HistoryRecyclerViewAdap
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
MaterialAlertDialogBuilder delete_dialog = new MaterialAlertDialogBuilder(context);
|
MaterialAlertDialogBuilder delete_dialog = new MaterialAlertDialogBuilder(fragmentContext);
|
||||||
delete_dialog.setTitle(getString(R.string.confirm_delete_history));
|
delete_dialog.setTitle(getString(R.string.confirm_delete_history));
|
||||||
delete_dialog.setMessage(getString(R.string.confirm_delete_history_desc));
|
delete_dialog.setMessage(getString(R.string.confirm_delete_history_desc));
|
||||||
delete_dialog.setNegativeButton(getString(R.string.cancel), (dialogInterface, i) -> {
|
delete_dialog.setNegativeButton(getString(R.string.cancel), (dialogInterface, i) -> {
|
||||||
|
|
@ -200,8 +200,34 @@ public class HistoryFragment extends Fragment implements HistoryRecyclerViewAdap
|
||||||
no_results.setVisibility(View.VISIBLE);
|
no_results.setVisibility(View.VISIBLE);
|
||||||
});
|
});
|
||||||
delete_dialog.show();
|
delete_dialog.show();
|
||||||
}else if(itemID == R.id.refresh_history){
|
}else if(itemID == R.id.filter_history){
|
||||||
initCards();
|
// bottomSheet = new BottomSheetDialog(fragmentContext);
|
||||||
|
// bottomSheet.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||||
|
// bottomSheet.setContentView(R.layout.history_bottom_sheet);
|
||||||
|
// Video video = historyObjects.get(position);
|
||||||
|
//
|
||||||
|
// TextView title = bottomSheet.findViewById(R.id.bottom_sheet_title);
|
||||||
|
// title.setText(video.getTitle());
|
||||||
|
//
|
||||||
|
// TextView author = bottomSheet.findViewById(R.id.bottom_sheet_author);
|
||||||
|
// author.setText(video.getAuthor());
|
||||||
|
//
|
||||||
|
// Button link = bottomSheet.findViewById(R.id.bottom_sheet_link);
|
||||||
|
// String url = video.getURL();
|
||||||
|
// link.setText(url);
|
||||||
|
// link.setTag(position);
|
||||||
|
// link.setOnClickListener(this);
|
||||||
|
//
|
||||||
|
// Button remove = bottomSheet.findViewById(R.id.bottomsheet_remove_button);
|
||||||
|
// remove.setTag(position);
|
||||||
|
// remove.setOnClickListener(this);
|
||||||
|
//
|
||||||
|
// Button openLink = bottomSheet.findViewById(R.id.bottomsheet_open_link_button);
|
||||||
|
// openLink.setTag(position);
|
||||||
|
// openLink.setOnClickListener(this);
|
||||||
|
//
|
||||||
|
// bottomSheet.show();
|
||||||
|
// bottomSheet.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.MATCH_PARENT);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
@ -224,7 +250,7 @@ public class HistoryFragment extends Fragment implements HistoryRecyclerViewAdap
|
||||||
if(bottomSheet != null) bottomSheet.hide();
|
if(bottomSheet != null) bottomSheet.hide();
|
||||||
|
|
||||||
Video v = historyObjects.get(position);
|
Video v = historyObjects.get(position);
|
||||||
MaterialAlertDialogBuilder delete_dialog = new MaterialAlertDialogBuilder(context);
|
MaterialAlertDialogBuilder delete_dialog = new MaterialAlertDialogBuilder(fragmentContext);
|
||||||
delete_dialog.setTitle(getString(R.string.confirm_delete_history));
|
delete_dialog.setTitle(getString(R.string.confirm_delete_history));
|
||||||
delete_dialog.setMessage(getString(R.string.you_are_going_to_delete) + " \""+v.getTitle()+"\"!");
|
delete_dialog.setMessage(getString(R.string.you_are_going_to_delete) + " \""+v.getTitle()+"\"!");
|
||||||
delete_dialog.setNegativeButton(getString(R.string.cancel), (dialogInterface, i) -> {
|
delete_dialog.setNegativeButton(getString(R.string.cancel), (dialogInterface, i) -> {
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog;
|
||||||
import com.google.android.material.button.MaterialButton;
|
import com.google.android.material.button.MaterialButton;
|
||||||
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
|
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
|
||||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
|
import com.google.android.material.progressindicator.LinearProgressIndicator;
|
||||||
import com.google.android.material.textfield.TextInputLayout;
|
import com.google.android.material.textfield.TextInputLayout;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
@ -56,7 +57,7 @@ import java.util.regex.Pattern;
|
||||||
public class HomeFragment extends Fragment implements HomeRecyclerViewAdapter.OnItemClickListener, View.OnClickListener {
|
public class HomeFragment extends Fragment implements HomeRecyclerViewAdapter.OnItemClickListener, View.OnClickListener {
|
||||||
private boolean downloading = false;
|
private boolean downloading = false;
|
||||||
private View fragmentView;
|
private View fragmentView;
|
||||||
private ProgressBar progressBar;
|
private LinearProgressIndicator progressBar;
|
||||||
private String inputQuery;
|
private String inputQuery;
|
||||||
private RecyclerView recyclerView;
|
private RecyclerView recyclerView;
|
||||||
private HomeRecyclerViewAdapter homeRecyclerViewAdapter;
|
private HomeRecyclerViewAdapter homeRecyclerViewAdapter;
|
||||||
|
|
@ -91,8 +92,6 @@ public class HomeFragment extends Fragment implements HomeRecyclerViewAdapter.On
|
||||||
MaterialButton clickedButton = recyclerView.findViewWithTag(id + "##"+type);
|
MaterialButton clickedButton = recyclerView.findViewWithTag(id + "##"+type);
|
||||||
progressBar = recyclerView.findViewWithTag(id + "##progress");
|
progressBar = recyclerView.findViewWithTag(id + "##progress");
|
||||||
progressBar.setVisibility(View.VISIBLE);
|
progressBar.setVisibility(View.VISIBLE);
|
||||||
progressBar.setIndeterminate(true);
|
|
||||||
progressBar.setProgress(0);
|
|
||||||
downloading = true;
|
downloading = true;
|
||||||
topAppBar.getMenu().findItem(R.id.cancel_download).setVisible(true);
|
topAppBar.getMenu().findItem(R.id.cancel_download).setVisible(true);
|
||||||
|
|
||||||
|
|
@ -111,12 +110,12 @@ public class HomeFragment extends Fragment implements HomeRecyclerViewAdapter.On
|
||||||
activity.runOnUiThread(() -> {
|
activity.runOnUiThread(() -> {
|
||||||
try{
|
try{
|
||||||
int progress = info.getProgress();
|
int progress = info.getProgress();
|
||||||
progressBar = fragmentView.findViewWithTag(info.getVideo().getVideoId()+"##progress");
|
if (progress > 0) {
|
||||||
progressBar.setVisibility(View.VISIBLE);
|
progressBar = fragmentView.findViewWithTag(info.getVideo().getVideoId()+"##progress");
|
||||||
if (progress > 1){
|
progressBar.setVisibility(View.VISIBLE);
|
||||||
progressBar.setIndeterminate(false);
|
progressBar.setProgressCompat(progress, true);
|
||||||
progressBar.setProgress(info.getProgress());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}catch(Exception ignored){}
|
}catch(Exception ignored){}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -154,16 +153,20 @@ public class HomeFragment extends Fragment implements HomeRecyclerViewAdapter.On
|
||||||
|
|
||||||
// MEDIA SCAN
|
// MEDIA SCAN
|
||||||
ArrayList<File> files = new ArrayList<>();
|
ArrayList<File> files = new ArrayList<>();
|
||||||
String title = downloadInfo.getVideo().getTitle();
|
String title = downloadInfo.getVideo().getTitle().replaceAll("[^a-zA-Z0-9]","");
|
||||||
|
String pathTmp = "";
|
||||||
File path = new File(downloadInfo.getDownloadPath());
|
File path = new File(downloadInfo.getDownloadPath());
|
||||||
for( File file : path.listFiles() ){
|
for( File file : path.listFiles() ){
|
||||||
if(file.isFile() && file.getAbsolutePath().contains(title)) files.add(file);
|
if(file.isFile()){
|
||||||
|
pathTmp = file.getAbsolutePath().replaceAll("[^a-zA-Z0-9]","");
|
||||||
|
if (pathTmp.contains(title)){
|
||||||
|
files.add(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String[] paths = new String[files.size()];
|
String[] paths = new String[files.size()];
|
||||||
for (int i = 0; i < files.size(); i++) paths[i] = files.get(i).getAbsolutePath();
|
for (int i = 0; i < files.size(); i++) paths[i] = files.get(i).getAbsolutePath();
|
||||||
|
|
||||||
MediaScannerConnection.scanFile(context, paths, null, null);
|
MediaScannerConnection.scanFile(context, paths, null, null);
|
||||||
addToHistory(item, new Date(), paths);
|
addToHistory(item, new Date(), paths);
|
||||||
updateDownloadStatusOnResult(item, type);
|
updateDownloadStatusOnResult(item, type);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<vector android:height="24dp"
|
<vector android:height="24dp"
|
||||||
android:viewportHeight="24" android:viewportWidth="24"
|
android:viewportHeight="24" android:viewportWidth="24"
|
||||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<path android:fillColor="?android:textColorPrimary" android:pathData="M15,16h4v2h-4zM15,8h7v2h-7zM15,12h6v2h-6zM3,18c0,1.1 0.9,2 2,2h6c1.1,0 2,-0.9 2,-2L13,8L3,8v10zM14,5h-3l-1,-1L6,4L5,5L2,5v2h12z"/>
|
<path android:fillColor="?android:textColorPrimary" android:pathData="M15,16h4v2h-4zM15,8h7v2h-7zM15,12h6v2h-6zM3,18c0,1.1 0.9,2 2,2h6c1.1,0 2,-0.9 2,-2L13,8L3,8v10zM5,10h6v8L5,18v-8zM10,4L6,4L5,5L2,5v2h12L14,5h-3z"/>
|
||||||
</vector>
|
</vector>
|
||||||
|
|
|
||||||
5
app/src/main/res/drawable/ic_filter.xml
Normal file
5
app/src/main/res/drawable/ic_filter.xml
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
<vector android:height="24dp"
|
||||||
|
android:viewportHeight="24" android:viewportWidth="24"
|
||||||
|
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<path android:fillColor="?android:textColorPrimary" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
|
||||||
|
</vector>
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:layout_scrollFlags="scroll|enterAlways|snap"
|
app:layout_scrollFlags="scroll|enterAlways|snap"
|
||||||
app:title="@string/history"
|
app:title="@string/downloads"
|
||||||
app:menu="@menu/history_menu"
|
app:menu="@menu/history_menu"
|
||||||
android:theme="@style/Toolbar"
|
android:theme="@style/Toolbar"
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -36,15 +36,13 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
<ProgressBar
|
<com.google.android.material.progressindicator.LinearProgressIndicator
|
||||||
android:id="@+id/download_progress"
|
android:id="@+id/download_progress"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_gravity="bottom"
|
android:layout_gravity="bottom"
|
||||||
android:backgroundTintMode="src_in"
|
android:indeterminate="true"
|
||||||
android:progress="0"
|
|
||||||
android:alpha="0.7"
|
android:alpha="0.7"
|
||||||
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
|
|
||||||
android:scaleY="100" />
|
android:scaleY="100" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
||||||
|
|
@ -10,11 +10,10 @@
|
||||||
app:showAsAction="collapseActionView|always"
|
app:showAsAction="collapseActionView|always"
|
||||||
app:actionViewClass="androidx.appcompat.widget.SearchView"/>
|
app:actionViewClass="androidx.appcompat.widget.SearchView"/>
|
||||||
|
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/refresh_history"
|
android:id="@+id/filter_history"
|
||||||
android:icon="@drawable/ic_refresh"
|
android:icon="@drawable/ic_filter"
|
||||||
android:title="@string/refresh_history"
|
android:title="@string/filter_history"
|
||||||
app:showAsAction="ifRoom" />
|
app:showAsAction="ifRoom" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
<string name="fshi_historin">Pastro Historinë</string>
|
<string name="fshi_historin">Pastro Historinë</string>
|
||||||
<string name="end_of_results"><b>Arrite fundin e rezultateve</b></string>
|
<string name="end_of_results"><b>Arrite fundin e rezultateve</b></string>
|
||||||
<string name="download_all">Shkarko të gjitha</string>
|
<string name="download_all">Shkarko të gjitha</string>
|
||||||
<string name="history">Historia</string>
|
|
||||||
<string name="settings">Cilësime</string>
|
<string name="settings">Cilësime</string>
|
||||||
<string name="home">Kryesore</string>
|
<string name="home">Kryesore</string>
|
||||||
<string name="directories">Direktoritë</string>
|
<string name="directories">Direktoritë</string>
|
||||||
|
|
@ -97,4 +96,5 @@
|
||||||
<string name="api_key_summary">Përdor një çelës api për të marrë rezultate më të shpejta nga YouTube</string>
|
<string name="api_key_summary">Përdor një çelës api për të marrë rezultate më të shpejta nga YouTube</string>
|
||||||
<string name="update_app_summary">Njoftohu kur një përditësim është i vlefshëm</string>
|
<string name="update_app_summary">Njoftohu kur një përditësim është i vlefshëm</string>
|
||||||
<string name="downloads">Shkarkimet</string>
|
<string name="downloads">Shkarkimet</string>
|
||||||
|
<string name="filter_history">Filtro Historinë</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
<string name="Trending"><b>Trending</b></string>
|
<string name="Trending"><b>Trending</b></string>
|
||||||
<string name="end_of_results"><b>You reached the end of results</b></string>
|
<string name="end_of_results"><b>You reached the end of results</b></string>
|
||||||
<string name="download_all">Download All</string>
|
<string name="download_all">Download All</string>
|
||||||
<string name="history">History</string>
|
|
||||||
<string name="settings">Settings</string>
|
<string name="settings">Settings</string>
|
||||||
<string name="home">Home</string>
|
<string name="home">Home</string>
|
||||||
<string name="directories">Directories</string>
|
<string name="directories">Directories</string>
|
||||||
|
|
@ -100,4 +99,5 @@
|
||||||
<string name="api_key_summary">Use an api key to get faster results from YouTube</string>
|
<string name="api_key_summary">Use an api key to get faster results from YouTube</string>
|
||||||
<string name="update_app_summary">Let you know when updates are available right when you open the application</string>
|
<string name="update_app_summary">Let you know when updates are available right when you open the application</string>
|
||||||
<string name="downloads">Downloads</string>
|
<string name="downloads">Downloads</string>
|
||||||
|
<string name="filter_history">Filter History</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue