Skip to content

Commit cf200da

Browse files
committed
Optimizations
1 parent cc497e4 commit cf200da

32 files changed

+36
-28
lines changed

.gitignore

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
# Built application files
2-
*.apk
3-
*.ap_
4-
5-
# Files for the Dalvik VM
6-
*.dex
7-
8-
# Java class files
9-
*.class
10-
111
# Sign info
122
*.jks
133

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
compile('com.mikepenz:aboutlibraries:5.2.5@aar') {
3939
transitive = true
4040
}
41-
compile('com.mikepenz:materialdrawer:4.3.6@aar') {
41+
compile('com.mikepenz:materialdrawer:4.4.0@aar') {
4242
transitive = true
4343
}
4444
compile 'com.mikepenz:community-material-typeface:1.2.64.1@aar'

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<service android:name=".customtabs.KeepAliveService" />
5252

5353
<activity
54-
android:name=".activity.NewsImageDetailActivity"
54+
android:name=".activity.ImageDetailActivity"
5555
android:parentActivityName=".activity.DashboardActivity"
5656
android:theme="@style/Theme.Transparent">
5757
<meta-data

app/src/main/java/com/proxerme/app/activity/DashboardActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
*/
6262
public class DashboardActivity extends MainActivity {
6363

64-
public static final String EXTRA_DRAWER_ITEM = "extra_drawer_item";
65-
public static final String EXTRA_ADDITIONAL_INFO = "extra_additional_info";
66-
public static final String STATE_TITLE = "dashboard_title";
64+
private static final String EXTRA_DRAWER_ITEM = "extra_drawer_item";
65+
private static final String EXTRA_ADDITIONAL_INFO = "extra_additional_info";
66+
private static final String STATE_TITLE = "dashboard_title";
6767

6868
@Bind(R.id.toolbar)
6969
Toolbar toolbar;

app/src/main/java/com/proxerme/app/activity/NewsImageDetailActivity.java renamed to app/src/main/java/com/proxerme/app/activity/ImageDetailActivity.java

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
import android.app.Activity;
44
import android.content.Intent;
5+
import android.graphics.Bitmap;
6+
import android.graphics.BitmapFactory;
57
import android.os.Build;
68
import android.os.Bundle;
79
import android.support.annotation.NonNull;
810
import android.support.v4.app.ActivityOptionsCompat;
11+
import android.support.v4.content.ContextCompat;
912
import android.support.v7.app.AppCompatActivity;
1013
import android.view.MenuItem;
1114
import android.widget.ImageView;
@@ -20,22 +23,24 @@
2023
import butterknife.ButterKnife;
2124
import butterknife.OnClick;
2225

26+
import static android.app.ActivityManager.TaskDescription;
27+
2328
/**
2429
* An Activity which shows a image with an animation on Lollipop and higher.
2530
* It also has a transparent background.
2631
*
2732
* @author Ruben Gees
2833
*/
29-
public class NewsImageDetailActivity extends AppCompatActivity {
34+
public class ImageDetailActivity extends AppCompatActivity {
3035

31-
public static final String EXTRA_URL = "extra_url";
36+
private static final String EXTRA_URL = "extra_url";
3237

3338
@Bind(R.id.activity_news_image_detail_image)
3439
ImageView image;
3540

3641
public static void navigateTo(@NonNull Activity context, @NonNull ImageView image,
3742
@NonNull String url) {
38-
Intent intent = new Intent(context, NewsImageDetailActivity.class);
43+
Intent intent = new Intent(context, ImageDetailActivity.class);
3944

4045
intent.putExtra(EXTRA_URL, url);
4146

@@ -54,6 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
5459
setContentView(R.layout.activity_news_image_detail);
5560

5661
ButterKnife.bind(this);
62+
styleRecents();
5763

5864
String url = getIntent().getStringExtra(EXTRA_URL);
5965

@@ -78,6 +84,15 @@ public boolean onResourceReady(GlideDrawable resource, String model,
7884
.into(image);
7985
}
8086

87+
private void styleRecents() {
88+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
89+
Bitmap bm = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
90+
TaskDescription taskDesc = new TaskDescription(getString(R.string.app_name), bm,
91+
ContextCompat.getColor(this, R.color.primary));
92+
setTaskDescription(taskDesc);
93+
}
94+
}
95+
8196
@Override
8297
public boolean onOptionsItemSelected(MenuItem item) {
8398
switch (item.getItemId()) {

app/src/main/java/com/proxerme/app/adapter/PagingAdapter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
import java.util.List;
1414

1515
/**
16-
* Created by geesr on 17.10.2015.
16+
* Todo: Describe Class
17+
*
18+
* @author Ruben Gees
1719
*/
1820
public abstract class PagingAdapter<T extends IdItem & Parcelable,
1921
V extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<V> {

app/src/main/java/com/proxerme/app/fragment/ConferencesFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import android.view.View;
88
import android.widget.ImageView;
99

10-
import com.proxerme.app.activity.NewsImageDetailActivity;
10+
import com.proxerme.app.activity.ImageDetailActivity;
1111
import com.proxerme.app.adapter.ConferenceAdapter;
1212
import com.proxerme.library.connection.ProxerConnection;
1313
import com.proxerme.library.connection.ProxerException;
@@ -60,13 +60,13 @@ protected void configAdapter(ConferenceAdapter adapter) {
6060
.OnConferenceInteractionListener() {
6161
@Override
6262
public void onConferenceClick(@NonNull View v, @NonNull Conference conference) {
63-
63+
//TODO
6464
}
6565

6666
@Override
6767
public void onConferenceImageClick(@NonNull View v, @NonNull Conference conference) {
6868
if (!TextUtils.isEmpty(conference.getImageId())) {
69-
NewsImageDetailActivity.navigateTo(getActivity(), (ImageView) v,
69+
ImageDetailActivity.navigateTo(getActivity(), (ImageView) v,
7070
UrlHolder.getUserImage(conference.getImageId()));
7171
}
7272
}

app/src/main/java/com/proxerme/app/fragment/NewsFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import android.view.View;
88
import android.widget.ImageView;
99

10-
import com.proxerme.app.activity.NewsImageDetailActivity;
10+
import com.proxerme.app.activity.ImageDetailActivity;
1111
import com.proxerme.app.adapter.NewsAdapter;
1212
import com.proxerme.app.manager.NewsManager;
1313
import com.proxerme.app.util.MaterialDrawerHelper;
@@ -43,7 +43,7 @@ public void onNewsClick(@NonNull View v, @NonNull News news) {
4343

4444
@Override
4545
public void onNewsImageClick(@NonNull View v, @NonNull News news) {
46-
NewsImageDetailActivity.navigateTo(getActivity(), (ImageView) v,
46+
ImageDetailActivity.navigateTo(getActivity(), (ImageView) v,
4747
UrlHolder.getNewsImageUrl(news.getId(), news.getImageId()));
4848
}
4949

app/src/main/java/com/proxerme/app/util/MaterialDrawerHelper.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,8 @@ public boolean onItemClick(View view, int position, IDrawerItem iDrawerItem) {
109109
new AccountHeader.OnAccountHeaderListener() {
110110
@Override
111111
public boolean onProfileChanged(View view, IProfile profile, boolean current) {
112-
if (callback != null) {
113-
return callback.onAccountClick(profile.getIdentifier());
114-
}
112+
return callback != null && callback.onAccountClick(profile.getIdentifier());
115113

116-
return false;
117114
}
118115
};
119116

Loading

0 commit comments

Comments
 (0)