TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-27 22:38:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Signal 4.41.0

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-07 16:48:54 +10:00
parent 781a8500df 56c17e32f1
commit 1822e87f7c
584 changed files with 9504 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
View File

@@ -17,7 +17,6 @@
package org.thoughtcrime.securesms.scribbles;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.TabLayout;
@@ -25,14 +24,9 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.ImageSpan;
import android.view.MenuItem;
import org.thoughtcrime.securesms.BaseActionBarActivity;
import network.loki.messenger.R;
public class StickerSelectActivity extends FragmentActivity implements StickerSelectFragment.StickerSelectionListener {
@@ -54,10 +48,10 @@ public class StickerSelectActivity extends FragmentActivity implements StickerSe
super.onCreate(savedInstanceState);
setContentView(R.layout.scribble_select_sticker_activity);
ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
ViewPager viewPager = (ViewPager) findViewById(R.id.camera_sticker_pager);
viewPager.setAdapter(new StickerPagerAdapter(getSupportFragmentManager(), this));
TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
TabLayout tabLayout = (TabLayout) findViewById(R.id.camera_sticker_tabs);
tabLayout.setupWithViewPager(viewPager);
for (int i=0;i<tabLayout.getTabCount();i++) {

15
src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
View File

@@ -54,8 +54,7 @@ public class StickerSelectFragment extends Fragment implements LoaderManager.Loa
return fragment;
}
@Nullable
public View onCreateView(LayoutInflater inflater,
public @Nullable View onCreateView(@NonNull LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState)
{
@@ -77,17 +76,17 @@ public class StickerSelectFragment extends Fragment implements LoaderManager.Loa
}
@Override
public Loader<String[]> onCreateLoader(int id, Bundle args) {
public @NonNull Loader<String[]> onCreateLoader(int id, Bundle args) {
return new StickerLoader(getActivity(), assetDirectory);
}
@Override
public void onLoadFinished(Loader<String[]> loader, String[] data) {
public void onLoadFinished(@NonNull Loader<String[]> loader, String[] data) {
recyclerView.setAdapter(new StickersAdapter(getActivity(), glideRequests, data));
}
@Override
public void onLoaderReset(Loader<String[]> loader) {
public void onLoaderReset(@NonNull Loader<String[]> loader) {
recyclerView.setAdapter(null);
}
@@ -108,12 +107,12 @@ public class StickerSelectFragment extends Fragment implements LoaderManager.Loa
}
@Override
public StickerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public @NonNull StickerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new StickerViewHolder(layoutInflater.inflate(R.layout.scribble_sticker_item, parent, false));
}
@Override
public void onBindViewHolder(StickerViewHolder holder, int position) {
public void onBindViewHolder(@NonNull StickerViewHolder holder, int position) {
holder.fileName = stickerFiles[position];
glideRequests.load(Uri.parse("file:///android_asset/" + holder.fileName))
@@ -127,7 +126,7 @@ public class StickerSelectFragment extends Fragment implements LoaderManager.Loa
}
@Override
public void onViewRecycled(StickerViewHolder holder) {
public void onViewRecycled(@NonNull StickerViewHolder holder) {
super.onViewRecycled(holder);
glideRequests.clear(holder.image);
}

4
src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
View File

@@ -22,12 +22,12 @@ public class ColorPaletteAdapter extends RecyclerView.Adapter<ColorPaletteAdapte
private EventListener eventListener;
@Override
public ColorViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public @NonNull ColorViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new ColorViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_color, parent, false));
}
@Override
public void onBindViewHolder(ColorViewHolder holder, int position) {
public void onBindViewHolder(@NonNull ColorViewHolder holder, int position) {
holder.bind(colors.get(position), eventListener);
}