mirror of
https://github.com/oxen-io/session-android.git
synced 2025-02-25 14:47:20 +00:00
parent
06e0d7d72d
commit
23e9b3a61e
@ -16,7 +16,6 @@
|
|||||||
android:layout_height="?android:attr/actionBarSize"
|
android:layout_height="?android:attr/actionBarSize"
|
||||||
android:background="?attr/media_overview_toolbar_background"
|
android:background="?attr/media_overview_toolbar_background"
|
||||||
android:titleTextColor="?attr/media_overview_toolbar_foreground"
|
android:titleTextColor="?attr/media_overview_toolbar_foreground"
|
||||||
android:foreground="?attr/media_overview_toolbar_foreground"
|
|
||||||
app:layout_scrollFlags="scroll|enterAlways"/>
|
app:layout_scrollFlags="scroll|enterAlways"/>
|
||||||
|
|
||||||
<android.support.design.widget.TabLayout
|
<android.support.design.widget.TabLayout
|
||||||
|
@ -59,6 +59,8 @@ import java.util.Locale;
|
|||||||
* Activity for displaying media attachments in-app
|
* Activity for displaying media attachments in-app
|
||||||
*/
|
*/
|
||||||
public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
|
public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private final static String TAG = MediaOverviewActivity.class.getSimpleName();
|
private final static String TAG = MediaOverviewActivity.class.getSimpleName();
|
||||||
|
|
||||||
public static final String ADDRESS_EXTRA = "address";
|
public static final String ADDRESS_EXTRA = "address";
|
||||||
@ -198,7 +200,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
|
|||||||
private StickyHeaderGridLayoutManager gridManager;
|
private StickyHeaderGridLayoutManager gridManager;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
View view = inflater.inflate(R.layout.media_overview_gallery_fragment, container, false);
|
View view = inflater.inflate(R.layout.media_overview_gallery_fragment, container, false);
|
||||||
|
|
||||||
this.recyclerView = ViewUtil.findById(view, R.id.media_grid);
|
this.recyclerView = ViewUtil.findById(view, R.id.media_grid);
|
||||||
@ -244,7 +246,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
|
|||||||
public static class MediaOverviewDocumentsFragment extends MediaOverviewFragment<Cursor> {
|
public static class MediaOverviewDocumentsFragment extends MediaOverviewFragment<Cursor> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
View view = inflater.inflate(R.layout.media_overview_documents_fragment, container, false);
|
View view = inflater.inflate(R.layout.media_overview_documents_fragment, container, false);
|
||||||
MediaDocumentsAdapter adapter = new MediaDocumentsAdapter(getContext(), masterSecret, null, locale);
|
MediaDocumentsAdapter adapter = new MediaDocumentsAdapter(getContext(), masterSecret, null, locale);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user