diff --git a/app/build.gradle b/app/build.gradle
index c78b9df5..27f048fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,4 +68,5 @@ dependencies {
implementation("androidx.cardview:cardview:1.0.0")
implementation("com.squareup.picasso:picasso:2.8")
+ implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
}
diff --git a/app/src/main/java/com/deniscerri/ytdl/HistoryFragment.java b/app/src/main/java/com/deniscerri/ytdl/HistoryFragment.java
index fb0c4c05..ebf9a543 100644
--- a/app/src/main/java/com/deniscerri/ytdl/HistoryFragment.java
+++ b/app/src/main/java/com/deniscerri/ytdl/HistoryFragment.java
@@ -1,5 +1,6 @@
package com.deniscerri.ytdl;
+import android.app.ActionBar;
import android.content.Context;
import android.graphics.PorterDuff;
import android.graphics.Typeface;
@@ -15,8 +16,10 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.text.InputType;
+import android.util.Log;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -79,15 +82,25 @@ public class HistoryFragment extends Fragment {
initViews();
dbManager = new DBManager(requireContext());
- historyObjects = dbManager.merrHistorine();
+ initCards();
+
+ SwipeRefreshLayout swipeRefreshLayout = fragmentView.findViewById(R.id.swiperefresh);
+
+ swipeRefreshLayout.setOnRefreshListener(() -> {
+ initCards();
+ swipeRefreshLayout.setRefreshing(false);
+ });
- System.out.println(historyObjects);
+ return fragmentView;
+ }
+
+ private void initCards(){
+ linearLayout.removeAllViews();
+ historyObjects = dbManager.merrHistorine();
for(int i = historyObjects.size()-1; i >= 0; i--){
createCard(historyObjects.get(i));
}
-
- return fragmentView;
}
private int getDp(int value){
diff --git a/app/src/main/java/com/deniscerri/ytdl/HomeFragment.java b/app/src/main/java/com/deniscerri/ytdl/HomeFragment.java
index dd59fb3a..8f98a824 100644
--- a/app/src/main/java/com/deniscerri/ytdl/HomeFragment.java
+++ b/app/src/main/java/com/deniscerri/ytdl/HomeFragment.java
@@ -1,6 +1,7 @@
package com.deniscerri.ytdl;
import android.Manifest;
+import android.app.ActionBar;
import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
diff --git a/app/src/main/java/com/deniscerri/ytdl/MainActivity.java b/app/src/main/java/com/deniscerri/ytdl/MainActivity.java
index 595c6a69..8a29541b 100644
--- a/app/src/main/java/com/deniscerri/ytdl/MainActivity.java
+++ b/app/src/main/java/com/deniscerri/ytdl/MainActivity.java
@@ -84,13 +84,17 @@ public class MainActivity extends AppCompatActivity{
case R.id.home:
if(lastFragment == homeFragment){
homeFragment.scrollToTop();
+ }else{
+ this.setTitle("YTDLnis");;
}
replaceFragment(homeFragment);
break;
case R.id.history:
+ this.setTitle("Historia");;
replaceFragment(historyFragment);
break;
case R.id.settings:
+ this.setTitle("Cilësimet");;
replaceFragment(settingsFragment);
break;
diff --git a/app/src/main/java/com/deniscerri/ytdl/SettingsFragment.java b/app/src/main/java/com/deniscerri/ytdl/SettingsFragment.java
index 41617974..7657383c 100644
--- a/app/src/main/java/com/deniscerri/ytdl/SettingsFragment.java
+++ b/app/src/main/java/com/deniscerri/ytdl/SettingsFragment.java
@@ -1,10 +1,13 @@
package com.deniscerri.ytdl;
+import android.app.ActionBar;
import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
import android.widget.Toast;
import androidx.annotation.Nullable;
@@ -36,7 +39,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {
private CompositeDisposable compositeDisposable = new CompositeDisposable();
-
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
setPreferencesFromResource(R.xml.root_preferences, rootKey);
diff --git a/app/src/main/java/com/deniscerri/ytdl/api/YoutubeAPIManager.java b/app/src/main/java/com/deniscerri/ytdl/api/YoutubeAPIManager.java
index 862dcbf7..dd705e26 100644
--- a/app/src/main/java/com/deniscerri/ytdl/api/YoutubeAPIManager.java
+++ b/app/src/main/java/com/deniscerri/ytdl/api/YoutubeAPIManager.java
@@ -97,8 +97,8 @@ public class YoutubeAPIManager {
public Video getVideo(String id) throws JSONException {
JSONObject res = genericRequest("https://youtube.googleapis.com/youtube/v3/videos?part=snippet&id="+id+"&key="+key);
- res = res.getJSONObject("snippet");
- res.put("videoID", res.getString("id"));
+ res = res.getJSONArray("items").getJSONObject(0).getJSONObject("snippet");
+ res.put("videoID", id);
res = fixThumbnail(res);
Video v = createVideofromJSON(res);
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index c705cfc2..e8b3b41b 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -1,19 +1,28 @@
-
+ android:layout_height="match_parent" >
-
+ android:layout_height="match_parent"
+ android:backgroundTintMode="src_over"
+ tools:context=".HomeFragment"
+ android:id="@+id/scrollView1"
+ >
-
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 56a90917..9a5a07ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
def versionMajor = 1
def versionMinor = 0
-def versionPatch = 0
+def versionPatch = 1
def versionBuild = 0 // bump for dogfood builds, public betas, etc.
ext {