Browse Source
Merge branch 'master' into raniapl/development
renovate/org.robolectric-robolectric-4.x
Merge branch 'master' into raniapl/development
renovate/org.robolectric-robolectric-4.x
Ammar Githam
3 years ago
39 changed files with 319 additions and 188 deletions
-
11app/src/main/AndroidManifest.xml
-
7app/src/main/java/awais/instagrabber/InstaGrabberApplication.java
-
6app/src/main/java/awais/instagrabber/activities/MainActivity.java
-
5app/src/main/java/awais/instagrabber/adapters/DiscoverTopicsAdapter.java
-
52app/src/main/java/awais/instagrabber/adapters/viewholder/DiscoverViewHolder.java
-
4app/src/main/java/awais/instagrabber/adapters/viewholder/SliderVideoViewHolder.java
-
6app/src/main/java/awais/instagrabber/adapters/viewholder/TopicClusterViewHolder.java
-
4app/src/main/java/awais/instagrabber/adapters/viewholder/dialogs/KeywordsFilterDialogViewHolder.java
-
4app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java
-
6app/src/main/java/awais/instagrabber/customviews/PostsRecyclerView.java
-
2app/src/main/java/awais/instagrabber/dialogs/CreateBackupDialogFragment.java
-
6app/src/main/java/awais/instagrabber/dialogs/KeywordsFilterDialog.java
-
2app/src/main/java/awais/instagrabber/dialogs/RestoreBackupDialogFragment.java
-
1app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java
-
6app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java
-
13app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
-
4app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java
-
73app/src/main/java/awais/instagrabber/fragments/main/DiscoverFragment.java
-
19app/src/main/java/awais/instagrabber/fragments/search/SearchFragment.java
-
2app/src/main/java/awais/instagrabber/fragments/settings/BasePreferencesFragment.java
-
3app/src/main/java/awais/instagrabber/fragments/settings/DMPreferencesFragment.java
-
11app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java
-
13app/src/main/java/awais/instagrabber/fragments/settings/GeneralPreferencesFragment.java
-
20app/src/main/java/awais/instagrabber/fragments/settings/LocalePreferencesFragment.java
-
3app/src/main/java/awais/instagrabber/fragments/settings/NotificationsPreferencesFragment.java
-
9app/src/main/java/awais/instagrabber/fragments/settings/PostPreferencesFragment.java
-
29app/src/main/java/awais/instagrabber/fragments/settings/PreferenceKeys.java
-
7app/src/main/java/awais/instagrabber/fragments/settings/StoriesPreferencesFragment.java
-
2app/src/main/java/awais/instagrabber/fragments/settings/ThemePreferencesFragment.java
-
6app/src/main/java/awais/instagrabber/repositories/responses/discover/TopicCluster.java
-
34app/src/main/java/awais/instagrabber/utils/Constants.java
-
13app/src/main/java/awais/instagrabber/utils/DownloadUtils.java
-
4app/src/main/java/awais/instagrabber/utils/LocaleUtils.java
-
58app/src/main/java/awais/instagrabber/utils/SettingsHelper.java
-
13app/src/main/java/awais/instagrabber/utils/TextUtils.java
-
6app/src/main/java/awais/instagrabber/webservices/StoriesService.java
-
4app/src/main/res/values/strings.xml
-
28app/src/test/java/awais/instagrabber/utils/IntentUtilsTest.java
-
11app/src/test/java/awais/instagrabber/utils/TextUtilsTest.java
@ -1,26 +1,26 @@ |
|||
package awais.instagrabber.adapters.viewholder; |
|||
|
|||
import android.view.View; |
|||
import android.widget.ImageView; |
|||
|
|||
import androidx.annotation.NonNull; |
|||
import androidx.recyclerview.widget.RecyclerView; |
|||
|
|||
import com.facebook.drawee.view.SimpleDraweeView; |
|||
|
|||
import awais.instagrabber.R; |
|||
|
|||
public final class DiscoverViewHolder extends RecyclerView.ViewHolder { |
|||
public final SimpleDraweeView postImage; |
|||
public final ImageView typeIcon; |
|||
public final View selectedView; |
|||
// public final View progressView; |
|||
|
|||
public DiscoverViewHolder(@NonNull final View itemView) { |
|||
super(itemView); |
|||
typeIcon = itemView.findViewById(R.id.typeIcon); |
|||
postImage = itemView.findViewById(R.id.postImage); |
|||
selectedView = itemView.findViewById(R.id.selectedView); |
|||
// progressView = itemView.findViewById(R.id.progressView); |
|||
} |
|||
} |
|||
//package awais.instagrabber.adapters.viewholder; |
|||
// |
|||
//import android.view.View; |
|||
//import android.widget.ImageView; |
|||
// |
|||
//import androidx.annotation.NonNull; |
|||
//import androidx.recyclerview.widget.RecyclerView; |
|||
// |
|||
//import com.facebook.drawee.view.SimpleDraweeView; |
|||
// |
|||
//import awais.instagrabber.R; |
|||
// |
|||
//public final class DiscoverViewHolder extends RecyclerView.ViewHolder { |
|||
// public final SimpleDraweeView postImage; |
|||
// public final ImageView typeIcon; |
|||
// public final View selectedView; |
|||
// // public final View progressView; |
|||
// |
|||
// public DiscoverViewHolder(@NonNull final View itemView) { |
|||
// super(itemView); |
|||
// typeIcon = itemView.findViewById(R.id.typeIcon); |
|||
// postImage = itemView.findViewById(R.id.postImage); |
|||
// selectedView = itemView.findViewById(R.id.selectedView); |
|||
// // progressView = itemView.findViewById(R.id.progressView); |
|||
// } |
|||
//} |
@ -3,45 +3,13 @@ package awais.instagrabber.utils; |
|||
public final class Constants { |
|||
public static final String CRASH_REPORT_EMAIL = "[email protected]"; |
|||
|
|||
// string prefs |
|||
public static final String FOLDER_PATH = "custom_path"; |
|||
public static final String DATE_TIME_FORMAT = "date_time_format"; |
|||
public static final String DATE_TIME_SELECTION = "date_time_selection"; |
|||
public static final String CUSTOM_DATE_TIME_FORMAT = "date_time_custom_format"; |
|||
public static final String APP_THEME = "app_theme_v19"; |
|||
public static final String APP_LANGUAGE = "app_language_v19"; |
|||
public static final String STORY_SORT = "story_sort"; |
|||
// set string prefs |
|||
public static final String KEYWORD_FILTERS = "keyword_filters"; |
|||
// int prefs, do not export |
|||
public static final String PREV_INSTALL_VERSION = "prevVersion"; |
|||
public static final String BROWSER_UA_CODE = "browser_ua_code"; |
|||
public static final String APP_UA_CODE = "app_ua_code"; |
|||
// boolean prefs |
|||
public static final String DOWNLOAD_USER_FOLDER = "download_user_folder"; |
|||
public static final String TOGGLE_KEYWORD_FILTER = "toggle_keyword_filter"; |
|||
public static final String DOWNLOAD_PREPEND_USER_NAME = "download_user_name"; |
|||
public static final String PLAY_IN_BACKGROUND = "play_in_background"; |
|||
// deprecated: public static final String BOTTOM_TOOLBAR = "bottom_toolbar"; |
|||
public static final String FOLDER_SAVE_TO = "saved_to"; |
|||
public static final String AUTOPLAY_VIDEOS = "autoplay_videos"; |
|||
public static final String MUTED_VIDEOS = "muted_videos"; |
|||
public static final String SHOW_CAPTIONS = "show_captions"; |
|||
public static final String CUSTOM_DATE_TIME_FORMAT_ENABLED = "data_time_custom_enabled"; |
|||
public static final String SWAP_DATE_TIME_FORMAT_ENABLED = "swap_date_time_enabled"; |
|||
public static final String MARK_AS_SEEN = "mark_as_seen"; |
|||
public static final String HIDE_MUTED_REELS = "hide_muted_reels"; |
|||
public static final String DM_MARK_AS_SEEN = "dm_mark_as_seen"; |
|||
// deprecated: public static final String INSTADP = "instadp"; |
|||
// deprecated: public static final String STORIESIG = "storiesig"; |
|||
// deprecated: public static final String STORY_VIEWER = "story_viewer"; |
|||
// deprecated: public static final String AMOLED_THEME = "amoled_theme"; |
|||
public static final String CHECK_ACTIVITY = "check_activity"; |
|||
public static final String CHECK_UPDATES = "check_updates"; |
|||
public static final String FLAG_SECURE = "flag_secure"; |
|||
// never Export |
|||
public static final String COOKIE = "cookie"; |
|||
public static final String SHOW_QUICK_ACCESS_DIALOG = "show_quick_dlg"; |
|||
// deprecated: public static final String SHOW_QUICK_ACCESS_DIALOG = "show_quick_dlg"; |
|||
public static final String DEVICE_UUID = "device_uuid"; |
|||
public static final String BROWSER_UA = "browser_ua"; |
|||
public static final String APP_UA = "app_ua"; |
|||
|
@ -0,0 +1,28 @@ |
|||
// java.lang.RuntimeException: Method parse in android.net.Uri not mocked. |
|||
// See http://g.co/androidstudio/not-mocked for details. |
|||
|
|||
package awais.instagrabber.utils; |
|||
|
|||
import org.junit.jupiter.api.Assertions; |
|||
import org.junit.jupiter.api.Test; |
|||
|
|||
import awais.instagrabber.models.IntentModel; |
|||
import awais.instagrabber.models.enums.IntentModelType; |
|||
|
|||
class IntentUtilsTest { |
|||
|
|||
@Test |
|||
void getIntentFromUrl() { |
|||
IntentModel intent = IntentUtils.parseUrl("https://instagr.am/austinhuang.me"); |
|||
Assertions.assertEquals(new IntentModel(IntentModelType.USERNAME, "austinhuang.me"), intent); |
|||
intent = IntentUtils.parseUrl("https://www.instagr.am/_u/austinhuang.me"); |
|||
Assertions.assertEquals(new IntentModel(IntentModelType.USERNAME, "austinhuang.me"), intent); |
|||
intent = IntentUtils.parseUrl("https://instagram.com/p/BmjKdkxjzO7/"); |
|||
Assertions.assertEquals(new IntentModel(IntentModelType.POST, "BmjKdkxjzO7"), intent); |
|||
intent = IntentUtils.parseUrl("https://www.instagram.com/explore/tags/metrodemontreal/"); |
|||
Assertions.assertEquals(new IntentModel(IntentModelType.HASHTAG, "metrodemontreal"), intent); |
|||
intent = IntentUtils.parseUrl("http://www.instagram.com/explore/locations/538444610/abcde"); |
|||
Assertions.assertEquals(new IntentModel(IntentModelType.LOCATION, "538444610"), intent); |
|||
// todo: reel and igtv test cases that are sfw and preferably n i c e |
|||
} |
|||
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue