Fixed Settings back button

Author: jiangshen

app/.idea/caches/build_file_checksums.ser

@@ -47,12 +47,12 @@ dependencies {
     compile 'com.github.QuadFlask:colorpicker:0.0.13'
 
     compile 'com.google.firebase:firebase-storage:15.0.2'
-    compile 'com.google.firebase:firebase-auth:15.0.0'
+    compile 'com.google.firebase:firebase-auth:15.1.0'
     compile 'com.google.android.gms:play-services-auth:15.0.0'
     compile 'com.google.android.gms:play-services-games:15.0.0'
     compile 'com.google.firebase:firebase-messaging:15.0.2'
     compile 'com.google.firebase:firebase-database:15.0.0'
-    compile 'com.google.firebase:firebase-perf:15.0.0'
+    compile 'com.google.firebase:firebase-perf:15.1.0'
     compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
         transitive = true
     }

app/.idea/workspace.xml

@@ -56,7 +56,6 @@
             android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/build.gradle

@@ -740,9 +740,7 @@ public void nextImage(View v) {
             mStorageRef.getBytes(FIVE_HUNDRED_KILOBYTE).addOnSuccessListener(bytes -> {
                 SharedData.imgData = bytes;
                 clear(v);
-            }).addOnFailureListener(exception -> {
-            });
+            }).addOnFailureListener(exception -> {});
         }
-
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,22 +1,28 @@
 package com.example.caden.drawingtest;
 
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Random;
 
 public class RVHistoryAdapter extends RecyclerView.Adapter<RVHistoryAdapter.HistoryViewHolder> {
 
     private List<Wurm> wurms;
     private SparseArray<Bitmap> bmps;
+    private static String[] colors =
+            {"#009688", "#8BC34A", "#FFEB3B", "#FFC107", "#03A9F4", "#795548", "#9C27B0", "#00BCD4"};
+    private static Random rand = new Random();
 
     RVHistoryAdapter() {
         this.wurms = new ArrayList<>();
@@ -58,13 +64,16 @@ public int getItemCount() {
 
     static class HistoryViewHolder extends RecyclerView.ViewHolder {
 
+        private LinearLayout llHistory;
         private ImageView ivHistory;
         private TextView tvDateTime;
         private TextView tvFileName;
         private TextView tvItemNo;
 
         HistoryViewHolder(View itemView) {
             super(itemView);
+            llHistory = itemView.findViewById(R.id.ll_history);
+            llHistory.setBackgroundColor(Color.parseColor(colors[rand.nextInt(colors.length)]));
             ivHistory = itemView.findViewById(R.id.iv_history);
             tvDateTime = itemView.findViewById(R.id.tv_date_time);
             tvFileName = itemView.findViewById(R.id.tv_file_name);

app/src/main/java/com/example/caden/drawingtest/DrawingActivity.java

@@ -68,6 +68,7 @@ protected void onCreate(Bundle savedInstanceState) {
         user = FirebaseAuth.getInstance().getCurrentUser();
         getFragmentManager().beginTransaction().replace(android.R.id.content,
                 new WurmPrefFragment()).commit();
+
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
@@ -82,15 +83,12 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public boolean onMenuItemSelected(int featureId, MenuItem item) {
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            if (!super.onMenuItemSelected(featureId, item)) {
-                NavUtils.navigateUpFromSameTask(this);
-            }
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
             return true;
         }
-        return super.onMenuItemSelected(featureId, item);
+        return super.onOptionsItemSelected(item);
     }
 
     @Override

app/src/main/java/com/example/caden/drawingtest/RVHistoryAdapter.java

@@ -5,6 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#607D8B"
     tools:context=".HistoryActivity">
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rv_history"

app/src/main/java/com/example/caden/drawingtest/SettingsActivity.java

@@ -22,6 +22,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <LinearLayout
+                android:id="@+id/ll_history"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#FFEB3B"
+                android:minHeight="3dp"
+                android:orientation="horizontal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
             <ImageView
                 android:id="@+id/iv_history"
                 android:layout_width="128dp"