Skip to content

Commit 16f0a34

Browse files
ammargithamammargitham
committed
2 parents 27d919e + c326356 commit 16f0a34

File tree

92 files changed

+526
-1635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+526
-1635
lines changed

‎app/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ android {
5757

5858
buildTypes {
5959
debug {
60-
minifyEnabled true
60+
minifyEnabled false
6161
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
6262
}
6363

@@ -166,13 +166,13 @@ dependencies {
166166
def nav_version = '2.3.5'
167167
def exoplayer_version = '2.14.1'
168168

169-
implementation 'com.google.android.material:material:1.4.0-beta01'
169+
implementation 'com.google.android.material:material:1.4.0-rc01'
170170

171171
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
172172
implementation "com.google.android.exoplayer:exoplayer-dash:$exoplayer_version"
173173
implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version"
174174

175-
implementation "androidx.recyclerview:recyclerview:1.2.0"
175+
implementation "androidx.recyclerview:recyclerview:1.2.1"
176176
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
177177
implementation "androidx.viewpager2:viewpager2:1.0.0"
178178
implementation "androidx.navigation:navigation-fragment:$nav_version"
@@ -183,11 +183,11 @@ dependencies {
183183

184184
implementation 'com.google.guava:guava:27.0.1-android'
185185

186-
def core_version = "1.6.0-beta01"
186+
def core_version = "1.6.0-rc01"
187187
implementation "androidx.core:core:$core_version"
188188

189189
// Fragment
190-
implementation "androidx.fragment:fragment-ktx:1.3.4"
190+
implementation "androidx.fragment:fragment-ktx:1.3.5"
191191

192192
// Lifecycle
193193
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
@@ -203,10 +203,10 @@ dependencies {
203203
annotationProcessor "androidx.room:room-compiler:$room_version"
204204

205205
// CameraX
206-
def camerax_version = "1.1.0-alpha04"
206+
def camerax_version = "1.1.0-alpha05"
207207
implementation "androidx.camera:camera-camera2:$camerax_version"
208208
implementation "androidx.camera:camera-lifecycle:$camerax_version"
209-
implementation "androidx.camera:camera-view:1.0.0-alpha24"
209+
implementation "androidx.camera:camera-view:1.0.0-alpha25"
210210

211211
// EmojiCompat
212212
def emoji_compat_version = "1.1.0"
@@ -238,7 +238,7 @@ dependencies {
238238

239239
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
240240

241-
githubImplementation 'io.sentry:sentry-android:4.3.0'
241+
githubImplementation 'io.sentry:sentry-android:5.0.1'
242242

243243
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'
244244
testImplementation "androidx.test.ext:junit-ktx:1.1.2"

‎app/src/main/java/awais/instagrabber/activities/DirectorySelectActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected void onActivityResult(final int requestCode, final int resultCode, @Nu
8282
return;
8383
}
8484
if (!"com.android.externalstorage.documents".equals(data.getData().getAuthority())) {
85-
showErrorDialog(getString(R.string.dir_select_no_download_folder));
85+
showErrorDialog(getString(R.string.dir_select_no_download_folder, data.getData().getAuthority()));
8686
return;
8787
}
8888
AppExecutors.INSTANCE.getMainThread().execute(() -> {

‎app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private DirectItemViewHolder getItemViewHolder(final LayoutInflater layoutInflat
171171
return new DirectItemVideoCallEventViewHolder(baseBinding, binding, currentUser, thread, callback);
172172
}
173173
case PLACEHOLDER: {
174-
final LayoutDmTextBinding binding = LayoutDmTextBinding.inflate(layoutInflater, baseBinding.message, false);
174+
final LayoutDmStoryShareBinding binding = LayoutDmStoryShareBinding.inflate(layoutInflater, baseBinding.message, false);
175175
return new DirectItemPlaceholderViewHolder(baseBinding, binding, currentUser, thread, callback);
176176
}
177177
case ANIMATED_MEDIA: {
@@ -401,7 +401,7 @@ public interface DirectItemCallback {
401401

402402
void onEmailClick(String email);
403403

404-
void onMediaClick(Media media);
404+
void onMediaClick(Media media, int index);
405405

406406
void onStoryClick(DirectItemStoryShare storyShare);
407407

‎app/src/main/java/awais/instagrabber/adapters/FeedStoriesAdapter.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99

1010
import awais.instagrabber.adapters.viewholder.FeedStoryViewHolder;
1111
import awais.instagrabber.databinding.ItemHighlightBinding;
12-
import awais.instagrabber.models.FeedStoryModel;
12+
import awais.instagrabber.repositories.responses.stories.Story;
1313

14-
public final class FeedStoriesAdapter extends ListAdapter<FeedStoryModel, FeedStoryViewHolder> {
14+
public final class FeedStoriesAdapter extends ListAdapter<Story, FeedStoryViewHolder> {
1515
private final OnFeedStoryClickListener listener;
1616

17-
private static final DiffUtil.ItemCallback<FeedStoryModel> diffCallback = new DiffUtil.ItemCallback<FeedStoryModel>() {
17+
private static final DiffUtil.ItemCallback<Story> diffCallback = new DiffUtil.ItemCallback<Story>() {
1818
@Override
19-
public boolean areItemsTheSame(@NonNull final FeedStoryModel oldItem, @NonNull final FeedStoryModel newItem) {
20-
return oldItem.getStoryMediaId().equals(newItem.getStoryMediaId());
19+
public boolean areItemsTheSame(@NonNull final Story oldItem, @NonNull final Story newItem) {
20+
return oldItem.getId().equals(newItem.getId());
2121
}
2222

2323
@Override
24-
public boolean areContentsTheSame(@NonNull final FeedStoryModel oldItem, @NonNull final FeedStoryModel newItem) {
25-
return oldItem.getStoryMediaId().equals(newItem.getStoryMediaId()) && oldItem.isFullyRead() == newItem.isFullyRead();
24+
public boolean areContentsTheSame(@NonNull final Story oldItem, @NonNull final Story newItem) {
25+
return oldItem.getId().equals(newItem.getId()) && oldItem.getSeen() == newItem.getSeen();
2626
}
2727
};
2828

@@ -41,13 +41,13 @@ public FeedStoryViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, f
4141

4242
@Override
4343
public void onBindViewHolder(@NonNull final FeedStoryViewHolder holder, final int position) {
44-
final FeedStoryModel model = getItem(position);
44+
final Story model = getItem(position);
4545
holder.bind(model, position, listener);
4646
}
4747

4848
public interface OnFeedStoryClickListener {
49-
void onFeedStoryClick(FeedStoryModel model, int position);
49+
void onFeedStoryClick(Story model, int position);
5050

51-
void onFeedStoryLongClick(FeedStoryModel model, int position);
51+
void onFeedStoryLongClick(Story model, int position);
5252
}
5353
}

‎app/src/main/java/awais/instagrabber/adapters/FeedStoriesListAdapter.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515

1616
import awais.instagrabber.adapters.viewholder.StoryListViewHolder;
1717
import awais.instagrabber.databinding.ItemNotificationBinding;
18-
import awais.instagrabber.models.FeedStoryModel;
18+
import awais.instagrabber.repositories.responses.stories.Story;
1919
import awais.instagrabber.utils.TextUtils;
2020

21-
public final class FeedStoriesListAdapter extends ListAdapter<FeedStoryModel, StoryListViewHolder> implements Filterable {
21+
public final class FeedStoriesListAdapter extends ListAdapter<Story, StoryListViewHolder> implements Filterable {
2222
private final OnFeedStoryClickListener listener;
23-
private List<FeedStoryModel> list;
23+
private List<Story> list;
2424

2525
private final Filter filter = new Filter() {
2626
@NonNull
2727
@Override
2828
protected FilterResults performFiltering(final CharSequence filter) {
2929
final String query = TextUtils.isEmpty(filter) ? null : filter.toString().toLowerCase();
30-
List<FeedStoryModel> filteredList = list;
30+
List<Story> filteredList = list;
3131
if (list != null && query != null) {
3232
filteredList = list.stream()
33-
.filter(feedStoryModel -> feedStoryModel.getProfileModel()
33+
.filter(feedStoryModel -> feedStoryModel.getUser()
3434
.getUsername()
3535
.toLowerCase()
3636
.contains(query))
@@ -45,19 +45,19 @@ protected FilterResults performFiltering(final CharSequence filter) {
4545
@Override
4646
protected void publishResults(final CharSequence constraint, final FilterResults results) {
4747
//noinspection unchecked
48-
submitList((List<FeedStoryModel>) results.values, true);
48+
submitList((List<Story>) results.values, true);
4949
}
5050
};
5151

52-
private static final DiffUtil.ItemCallback<FeedStoryModel> diffCallback = new DiffUtil.ItemCallback<FeedStoryModel>() {
52+
private static final DiffUtil.ItemCallback<Story> diffCallback = new DiffUtil.ItemCallback<Story>() {
5353
@Override
54-
public boolean areItemsTheSame(@NonNull final FeedStoryModel oldItem, @NonNull final FeedStoryModel newItem) {
55-
return oldItem.getStoryMediaId().equals(newItem.getStoryMediaId());
54+
public boolean areItemsTheSame(@NonNull final Story oldItem, @NonNull final Story newItem) {
55+
return oldItem.getId().equals(newItem.getId());
5656
}
5757

5858
@Override
59-
public boolean areContentsTheSame(@NonNull final FeedStoryModel oldItem, @NonNull final FeedStoryModel newItem) {
60-
return oldItem.getStoryMediaId().equals(newItem.getStoryMediaId()) && oldItem.isFullyRead() == newItem.isFullyRead();
59+
public boolean areContentsTheSame(@NonNull final Story oldItem, @NonNull final Story newItem) {
60+
return oldItem.getId().equals(newItem.getId()) && oldItem.getSeen() == newItem.getSeen();
6161
}
6262
};
6363

@@ -71,15 +71,15 @@ public Filter getFilter() {
7171
return filter;
7272
}
7373

74-
private void submitList(@Nullable final List<FeedStoryModel> list, final boolean isFiltered) {
74+
private void submitList(@Nullable final List<Story> list, final boolean isFiltered) {
7575
if (!isFiltered) {
7676
this.list = list;
7777
}
7878
super.submitList(list);
7979
}
8080

8181
@Override
82-
public void submitList(final List<FeedStoryModel> list) {
82+
public void submitList(final List<Story> list) {
8383
submitList(list, false);
8484
}
8585

@@ -93,12 +93,12 @@ public StoryListViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, f
9393

9494
@Override
9595
public void onBindViewHolder(@NonNull final StoryListViewHolder holder, final int position) {
96-
final FeedStoryModel model = getItem(position);
96+
final Story model = getItem(position);
9797
holder.bind(model, listener);
9898
}
9999

100100
public interface OnFeedStoryClickListener {
101-
void onFeedStoryClick(final FeedStoryModel model);
101+
void onFeedStoryClick(final Story model);
102102

103103
void onProfileClick(final String username);
104104
}

‎app/src/main/java/awais/instagrabber/adapters/HighlightStoriesListAdapter.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99

1010
import awais.instagrabber.adapters.viewholder.StoryListViewHolder;
1111
import awais.instagrabber.databinding.ItemNotificationBinding;
12-
import awais.instagrabber.models.HighlightModel;
12+
import awais.instagrabber.repositories.responses.stories.Story;
1313

14-
public final class HighlightStoriesListAdapter extends ListAdapter<HighlightModel, StoryListViewHolder> {
14+
public final class HighlightStoriesListAdapter extends ListAdapter<Story, StoryListViewHolder> {
1515
private final OnHighlightStoryClickListener listener;
1616

17-
private static final DiffUtil.ItemCallback<HighlightModel> diffCallback = new DiffUtil.ItemCallback<HighlightModel>() {
17+
private static final DiffUtil.ItemCallback<Story> diffCallback = new DiffUtil.ItemCallback<Story>() {
1818
@Override
19-
public boolean areItemsTheSame(@NonNull final HighlightModel oldItem, @NonNull final HighlightModel newItem) {
19+
public boolean areItemsTheSame(@NonNull final Story oldItem, @NonNull final Story newItem) {
2020
return oldItem.getId().equals(newItem.getId());
2121
}
2222

2323
@Override
24-
public boolean areContentsTheSame(@NonNull final HighlightModel oldItem, @NonNull final HighlightModel newItem) {
24+
public boolean areContentsTheSame(@NonNull final Story oldItem, @NonNull final Story newItem) {
2525
return oldItem.getId().equals(newItem.getId());
2626
}
2727
};
@@ -41,12 +41,12 @@ public StoryListViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, f
4141

4242
@Override
4343
public void onBindViewHolder(@NonNull final StoryListViewHolder holder, final int position) {
44-
final HighlightModel model = getItem(position);
44+
final Story model = getItem(position);
4545
holder.bind(model, position, listener);
4646
}
4747

4848
public interface OnHighlightStoryClickListener {
49-
void onHighlightClick(final HighlightModel model, final int position);
49+
void onHighlightClick(final Story model, final int position);
5050

5151
void onProfileClick(final String username);
5252
}

‎app/src/main/java/awais/instagrabber/adapters/HighlightsAdapter.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99

1010
import awais.instagrabber.adapters.viewholder.HighlightViewHolder;
1111
import awais.instagrabber.databinding.ItemHighlightBinding;
12-
import awais.instagrabber.models.HighlightModel;
12+
import awais.instagrabber.repositories.responses.stories.Story;
1313

14-
public final class HighlightsAdapter extends ListAdapter<HighlightModel, HighlightViewHolder> {
14+
public final class HighlightsAdapter extends ListAdapter<Story, HighlightViewHolder> {
1515

1616
private final OnHighlightClickListener clickListener;
1717

18-
private static final DiffUtil.ItemCallback<HighlightModel> diffCallback = new DiffUtil.ItemCallback<HighlightModel>() {
18+
private static final DiffUtil.ItemCallback<Story> diffCallback = new DiffUtil.ItemCallback<Story>() {
1919
@Override
20-
public boolean areItemsTheSame(@NonNull final HighlightModel oldItem, @NonNull final HighlightModel newItem) {
20+
public boolean areItemsTheSame(@NonNull final Story oldItem, @NonNull final Story newItem) {
2121
return oldItem.getId().equals(newItem.getId());
2222
}
2323

2424
@Override
25-
public boolean areContentsTheSame(@NonNull final HighlightModel oldItem, @NonNull final HighlightModel newItem) {
25+
public boolean areContentsTheSame(@NonNull final Story oldItem, @NonNull final Story newItem) {
2626
return oldItem.getId().equals(newItem.getId());
2727
}
2828
};
@@ -42,14 +42,14 @@ public HighlightViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, f
4242

4343
@Override
4444
public void onBindViewHolder(@NonNull final HighlightViewHolder holder, final int position) {
45-
final HighlightModel highlightModel = getItem(position);
45+
final Story highlightModel = getItem(position);
4646
if (clickListener != null) {
4747
holder.itemView.setOnClickListener(v -> clickListener.onHighlightClick(highlightModel, position));
4848
}
4949
holder.bind(highlightModel);
5050
}
5151

5252
public interface OnHighlightClickListener {
53-
void onHighlightClick(final HighlightModel model, final int position);
53+
void onHighlightClick(final Story model, final int position);
5454
}
5555
}

0 commit comments

Comments
 (0)