yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 17:59:39 +02:00
Code Issues Releases Wiki Activity

rename media_overview_*-resources to profile_*-resources

Browse source
This commit is contained in:
B. Petersen 2019-05-19 16:11:40 +02:00
parent 7cc7b26796
commit d2849bb852
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
14 changed files with 30 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

0
res/layout/media_overview_activity.xml → res/layout/profile_activity.xml
View file

2
res/layout/media_overview_document_item.xml → res/layout/profile_document_item.xml
View file

@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:textSize="12sp" android:textSize="12sp"
android:textColor="?attr/media_overview_document_foreground" android:textColor="?attr/profile_document_foreground"
android:paddingTop="20dp" android:paddingTop="20dp"
tools:text="Jun 1"/> tools:text="Jun 1"/>

4
res/layout/media_overview_document_item_header.xml → res/layout/profile_document_item_header.xml
View file

@ -3,14 +3,14 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/media_overview_toolbar_background" android:background="?attr/profile_toolbar_background"
android:padding="16dp"> android:padding="16dp">
<TextView android:id="@+id/text" <TextView android:id="@+id/text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:textColor="?attr/media_overview_header_foreground" android:textColor="?attr/profile_header_foreground"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
tools:text="March 1, 2015" /> tools:text="March 1, 2015" />

2
res/layout/media_overview_documents_fragment.xml → res/layout/profile_documents_fragment.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/media_overview_toolbar_background"> android:background="?attr/profile_toolbar_background">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"

2
res/layout/media_overview_gallery_fragment.xml → res/layout/profile_gallery_fragment.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/media_overview_toolbar_background"> android:background="?attr/profile_toolbar_background">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/media_grid" android:id="@+id/media_grid"

0
res/layout/media_overview_gallery_item.xml → res/layout/profile_gallery_item.xml
View file

4
res/layout/media_overview_gallery_item_header.xml → res/layout/profile_gallery_item_header.xml
View file

@ -3,14 +3,14 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/media_overview_toolbar_background" android:background="?attr/profile_toolbar_background"
android:padding="16dp"> android:padding="16dp">
<TextView android:id="@+id/text" <TextView android:id="@+id/text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:textColor="?attr/media_overview_header_foreground" android:textColor="?attr/profile_header_foreground"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
tools:text="March 1, 2015" /> tools:text="March 1, 2015" />

0
res/menu/media_overview_context.xml → res/menu/profile_context.xml
View file

9
res/values/attrs.xml
View file

@ -136,11 +136,10 @@
<attr name="verification_background" format="color"/> <attr name="verification_background" format="color"/>
<attr name="media_overview_toolbar_background" format="color"/> <attr name="profile_toolbar_background" format="color"/>
<attr name="media_overview_toolbar_foreground" format="color"/> <attr name="profile_toolbar_foreground" format="color"/>
<attr name="media_overview_header_foreground" format="color"/> <attr name="profile_header_foreground" format="color"/>
<attr name="media_overview_document_background" format="color"/> <attr name="profile_document_foreground" format="color"/>
<attr name="media_overview_document_foreground" format="color"/>
<attr name="shared_contact_details_header_background" format="color"/> <attr name="shared_contact_details_header_background" format="color"/>
<attr name="shared_contact_details_titlebar" format="color"/> <attr name="shared_contact_details_titlebar" format="color"/>

2
res/values/dimens.xml
View file

@ -44,7 +44,7 @@
<dimen name="quote_corner_radius_bottom">4dp</dimen> <dimen name="quote_corner_radius_bottom">4dp</dimen>
<dimen name="quote_corner_radius_preview">18dp</dimen> <dimen name="quote_corner_radius_preview">18dp</dimen>
<integer name="media_overview_cols">3</integer> <integer name="profile_cols">3</integer>
<dimen name="quick_camera_shutter_ring_size">52dp</dimen> <dimen name="quick_camera_shutter_ring_size">52dp</dimen>

18
res/values/themes.xml
View file

@ -17,11 +17,10 @@
<item name="contact_selection_lay_user">#a0000000</item> <item name="contact_selection_lay_user">#a0000000</item>
<item name="contact_selection_header_text">@color/delta_primary_dark</item> <item name="contact_selection_header_text">@color/delta_primary_dark</item>
<item name="media_overview_toolbar_background">@color/white</item> <item name="profile_toolbar_background">@color/white</item>
<item name="media_overview_toolbar_foreground">@color/gray70</item> <item name="profile_toolbar_foreground">@color/gray70</item>
<item name="media_overview_header_foreground">@color/gray50</item> <item name="profile_header_foreground">@color/gray50</item>
<item name="media_overview_document_foreground">@color/gray70</item> <item name="profile_document_foreground">@color/gray70</item>
<item name="media_overview_document_background">@color/white</item>
</style> </style>
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.DarkTheme"> <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.DarkTheme">
@ -39,11 +38,10 @@
<item name="contact_selection_lay_user">#afeeeeee</item> <item name="contact_selection_lay_user">#afeeeeee</item>
<item name="contact_selection_header_text">#66eeeeee</item> <item name="contact_selection_header_text">#66eeeeee</item>
<item name="media_overview_toolbar_background">@color/black</item> <item name="profile_toolbar_background">@color/black</item>
<item name="media_overview_toolbar_foreground">@color/white</item> <item name="profile_toolbar_foreground">@color/white</item>
<item name="media_overview_header_foreground">@color/gray10</item> <item name="profile_header_foreground">@color/gray10</item>
<item name="media_overview_document_foreground">@color/white</item> <item name="profile_document_foreground">@color/white</item>
<item name="media_overview_document_background">@color/black</item>
</style> </style>
<style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme"> <style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">

4
src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
View file

@ -43,7 +43,7 @@ public class MediaDocumentsAdapter extends CursorRecyclerViewAdapter<ViewHolder>
@Override @Override
public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) { public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
return new ViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.media_overview_document_item, parent, false)); return new ViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.profile_document_item, parent, false));
} }
@Override @Override
@ -84,7 +84,7 @@ public class MediaDocumentsAdapter extends CursorRecyclerViewAdapter<ViewHolder>
@Override @Override
public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent) { public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent) {
return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.media_overview_document_item_header, parent, false)); return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.profile_document_item_header, parent, false));
} }
@Override @Override

4
src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
View file

@ -90,12 +90,12 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter {
@Override @Override
public StickyHeaderGridAdapter.HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int headerType) { public StickyHeaderGridAdapter.HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int headerType) {
return new HeaderHolder(LayoutInflater.from(context).inflate(R.layout.media_overview_gallery_item_header, parent, false)); return new HeaderHolder(LayoutInflater.from(context).inflate(R.layout.profile_gallery_item_header, parent, false));
} }
@Override @Override
public ItemViewHolder onCreateItemViewHolder(ViewGroup parent, int itemType) { public ItemViewHolder onCreateItemViewHolder(ViewGroup parent, int itemType) {
return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.media_overview_gallery_item, parent, false)); return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.profile_gallery_item, parent, false));
} }
@Override @Override

12
src/org/thoughtcrime/securesms/ProfileActivity.java
View file

@ -97,7 +97,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
@Override @Override
protected void onCreate(Bundle bundle, boolean ready) { protected void onCreate(Bundle bundle, boolean ready) {
setContentView(R.layout.media_overview_activity); setContentView(R.layout.profile_activity);
initializeResources(); initializeResources();
initializeToolbar(); initializeToolbar();
@ -312,11 +312,11 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
@Override @Override
public View onCreateView(@NonNull 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.profile_gallery_fragment, container, false);
this.recyclerView = ViewUtil.findById(view, R.id.media_grid); this.recyclerView = ViewUtil.findById(view, R.id.media_grid);
this.noMedia = ViewUtil.findById(view, R.id.no_images); this.noMedia = ViewUtil.findById(view, R.id.no_images);
this.gridManager = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.media_overview_cols)); this.gridManager = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.profile_cols));
this.recyclerView.setAdapter(new MediaGalleryAdapter(getContext(), this.recyclerView.setAdapter(new MediaGalleryAdapter(getContext(),
GlideApp.with(this), GlideApp.with(this),
@ -333,7 +333,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
if (gridManager != null) { if (gridManager != null) {
this.gridManager = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.media_overview_cols)); this.gridManager = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.profile_cols));
this.recyclerView.setLayoutManager(gridManager); this.recyclerView.setLayoutManager(gridManager);
} }
} }
@ -452,7 +452,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
@Override @Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) { public boolean onCreateActionMode(ActionMode mode, Menu menu) {
mode.getMenuInflater().inflate(R.menu.media_overview_context, menu); mode.getMenuInflater().inflate(R.menu.profile_context, menu);
mode.setTitle("1"); mode.setTitle("1");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@ -498,7 +498,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
@Override @Override
public View onCreateView(@NonNull 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.profile_documents_fragment, container, false);
MediaDocumentsAdapter adapter = new MediaDocumentsAdapter(getContext(), null, locale); MediaDocumentsAdapter adapter = new MediaDocumentsAdapter(getContext(), null, locale);
this.recyclerView = ViewUtil.findById(view, R.id.recycler_view); this.recyclerView = ViewUtil.findById(view, R.id.recycler_view);