Optimizations

.gitignore

@@ -1,13 +1,3 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
 # Sign info
 *.jks
 

app/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     compile('com.mikepenz:aboutlibraries:5.2.5@aar') {
         transitive = true
     }
-    compile('com.mikepenz:materialdrawer:4.3.6@aar') {
+    compile('com.mikepenz:materialdrawer:4.4.0@aar') {
         transitive = true
     }
     compile 'com.mikepenz:community-material-typeface:1.2.64.1@aar'

app/src/main/AndroidManifest.xml

@@ -51,7 +51,7 @@
         <service android:name=".customtabs.KeepAliveService" />
 
         <activity
-            android:name=".activity.NewsImageDetailActivity"
+            android:name=".activity.ImageDetailActivity"
             android:parentActivityName=".activity.DashboardActivity"
             android:theme="@style/Theme.Transparent">
             <meta-data

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

@@ -61,9 +61,9 @@
  */
 public class DashboardActivity extends MainActivity {
 
-    public static final String EXTRA_DRAWER_ITEM = "extra_drawer_item";
-    public static final String EXTRA_ADDITIONAL_INFO = "extra_additional_info";
-    public static final String STATE_TITLE = "dashboard_title";
+    private static final String EXTRA_DRAWER_ITEM = "extra_drawer_item";
+    private static final String EXTRA_ADDITIONAL_INFO = "extra_additional_info";
+    private static final String STATE_TITLE = "dashboard_title";
 
     @Bind(R.id.toolbar)
     Toolbar toolbar;

app/src/main/java/com/proxerme/app/activity/NewsImageDetailActivity.java → app/src/main/java/com/proxerme/app/activity/ImageDetailActivity.java

@@ -2,10 +2,13 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.widget.ImageView;
@@ -20,22 +23,24 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
+import static android.app.ActivityManager.TaskDescription;
+
 /**
  * An Activity which shows a image with an animation on Lollipop and higher.
  * It also has a transparent background.
  *
  * @author Ruben Gees
  */
-public class NewsImageDetailActivity extends AppCompatActivity {
+public class ImageDetailActivity extends AppCompatActivity {
 
-    public static final String EXTRA_URL = "extra_url";
+    private static final String EXTRA_URL = "extra_url";
 
     @Bind(R.id.activity_news_image_detail_image)
     ImageView image;
 
     public static void navigateTo(@NonNull Activity context, @NonNull ImageView image,
                                   @NonNull String url) {
-        Intent intent = new Intent(context, NewsImageDetailActivity.class);
+        Intent intent = new Intent(context, ImageDetailActivity.class);
 
         intent.putExtra(EXTRA_URL, url);
 
@@ -54,6 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_news_image_detail);
 
         ButterKnife.bind(this);
+        styleRecents();
 
         String url = getIntent().getStringExtra(EXTRA_URL);
 
@@ -78,6 +84,15 @@ public boolean onResourceReady(GlideDrawable resource, String model,
                 .into(image);
     }
 
+    private void styleRecents() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Bitmap bm = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
+            TaskDescription taskDesc = new TaskDescription(getString(R.string.app_name), bm,
+                    ContextCompat.getColor(this, R.color.primary));
+            setTaskDescription(taskDesc);
+        }
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {

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

@@ -13,7 +13,9 @@
 import java.util.List;
 
 /**
- * Created by geesr on 17.10.2015.
+ * Todo: Describe Class
+ *
+ * @author Ruben Gees
  */
 public abstract class PagingAdapter<T extends IdItem & Parcelable,
         V extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<V> {

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

@@ -7,7 +7,7 @@
 import android.view.View;
 import android.widget.ImageView;
 
-import com.proxerme.app.activity.NewsImageDetailActivity;
+import com.proxerme.app.activity.ImageDetailActivity;
 import com.proxerme.app.adapter.ConferenceAdapter;
 import com.proxerme.library.connection.ProxerConnection;
 import com.proxerme.library.connection.ProxerException;
@@ -60,13 +60,13 @@ protected void configAdapter(ConferenceAdapter adapter) {
                 .OnConferenceInteractionListener() {
             @Override
             public void onConferenceClick(@NonNull View v, @NonNull Conference conference) {
-
+                //TODO
             }
 
             @Override
             public void onConferenceImageClick(@NonNull View v, @NonNull Conference conference) {
                 if (!TextUtils.isEmpty(conference.getImageId())) {
-                    NewsImageDetailActivity.navigateTo(getActivity(), (ImageView) v,
+                    ImageDetailActivity.navigateTo(getActivity(), (ImageView) v,
                             UrlHolder.getUserImage(conference.getImageId()));
                 }
             }

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

@@ -7,7 +7,7 @@
 import android.view.View;
 import android.widget.ImageView;
 
-import com.proxerme.app.activity.NewsImageDetailActivity;
+import com.proxerme.app.activity.ImageDetailActivity;
 import com.proxerme.app.adapter.NewsAdapter;
 import com.proxerme.app.manager.NewsManager;
 import com.proxerme.app.util.MaterialDrawerHelper;
@@ -43,7 +43,7 @@ public void onNewsClick(@NonNull View v, @NonNull News news) {
 
             @Override
             public void onNewsImageClick(@NonNull View v, @NonNull News news) {
-                NewsImageDetailActivity.navigateTo(getActivity(), (ImageView) v,
+                ImageDetailActivity.navigateTo(getActivity(), (ImageView) v,
                         UrlHolder.getNewsImageUrl(news.getId(), news.getImageId()));
             }
 

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

@@ -109,11 +109,8 @@ public boolean onItemClick(View view, int position, IDrawerItem iDrawerItem) {
             new AccountHeader.OnAccountHeaderListener() {
                 @Override
                 public boolean onProfileChanged(View view, IProfile profile, boolean current) {
-                    if (callback != null) {
-                        return callback.onAccountClick(profile.getIdentifier());
-                    }
+                    return callback != null && callback.onAccountClick(profile.getIdentifier());
 
-                    return false;
                 }
             };
 

app/src/main/res/layout/activity_news_image_detail.xml

@@ -16,6 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
+        android:contentDescription="@string/image_detail_description"
         android:transitionName="image"
         tools:ignore="UnusedAttribute" />
 </FrameLayout>

app/src/main/res/layout/item_news.xml

@@ -68,6 +68,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_margin="4dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/button_expand_description"
                 android:scaleType="centerCrop" />
 
             <View

app/src/main/res/values/strings.xml

@@ -53,4 +53,6 @@
     <string name="drawer_item_messages">Messages</string>
     <string name="participant_single">Participant</string>
     <string name="participant_multiple">Participants</string>
+    <string name="image_detail_description">Detailed image</string>
+    <string name="button_expand_description">Expand item</string>
 </resources>