Merge remote-tracking branch 'github-desktop-ammargitham/task/add-favourites' into pr/170

This commit is contained in:
Austin Huang 2020-09-22 23:16:14 -04:00
commit 3c5d73e28e
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
3 changed files with 7 additions and 10 deletions

View File

@ -7,7 +7,7 @@ android {
defaultConfig { defaultConfig {
applicationId 'me.austinhuang.instagrabbr' applicationId 'me.austinhuang.instagrabbr'
minSdkVersion 16 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 51 versionCode 51
@ -54,7 +54,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:2.0.1" implementation "androidx.constraintlayout:constraintlayout:2.0.1"
implementation "androidx.preference:preference:$preference_version" implementation "androidx.preference:preference:$preference_version"
implementation 'com.github.hendrawd:StorageUtil:1.1.0' // implementation 'com.github.hendrawd:StorageUtil:1.1.0'
implementation 'org.jsoup:jsoup:1.13.1' implementation 'org.jsoup:jsoup:1.13.1'
implementation 'com.facebook.fresco:fresco:2.3.0' implementation 'com.facebook.fresco:fresco:2.3.0'

View File

@ -1,11 +1,10 @@
package awais.instagrabber; package awais.instagrabber;
import android.app.Application;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import androidx.multidex.MultiDexApplication;
import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.imagepipeline.core.ImagePipelineConfig; import com.facebook.imagepipeline.core.ImagePipelineConfig;
@ -27,7 +26,7 @@ import static awais.instagrabber.utils.Utils.datetimeParser;
import static awais.instagrabber.utils.Utils.logCollector; import static awais.instagrabber.utils.Utils.logCollector;
import static awais.instagrabber.utils.Utils.settingsHelper; import static awais.instagrabber.utils.Utils.settingsHelper;
public final class InstaGrabberApplication extends MultiDexApplication { public final class InstaGrabberApplication extends Application {
private static final String TAG = "InstaGrabberApplication"; private static final String TAG = "InstaGrabberApplication";
@Override @Override

View File

@ -39,9 +39,7 @@ import androidx.navigation.ui.NavigationUI;
import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout;
import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;
import hendrawd.storageutil.library.StorageUtil;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -160,9 +158,9 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
} }
getSupportFragmentManager().addOnBackStackChangedListener(this); getSupportFragmentManager().addOnBackStackChangedListener(this);
Log.d("austin_debug", "dir: "+Arrays.toString(StorageUtil.getStorageDirectories(getApplicationContext()))); // Log.d("austin_debug", "dir: "+Arrays.toString(StorageUtil.getStorageDirectories(getApplicationContext())));
final File sdcard = new File(StorageUtil.getStorageDirectories(getApplicationContext())[0]); // final File sdcard = new File(StorageUtil.getStorageDirectories(getApplicationContext())[0]);
Log.d("austin_debug", "files: "+Arrays.toString(sdcard.listFiles())); // Log.d("austin_debug", "files: "+Arrays.toString(sdcard.listFiles()));
} }
@Override @Override