Toolbar color customization support

Author: gabrielskm

.gitignore

@@ -1,11 +1,82 @@
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
 *.iml
-.gradle
-/local.properties
-/.idea/caches/build_file_checksums.ser
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-.DS_Store
-/build
-/captures
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/

.idea/caches/gradle_models.ser

@@ -1,6 +1,7 @@
 package com.skrumble.imagepicketeditor;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -11,16 +12,20 @@
 import com.skrumble.picketeditor.PickerEditor;
 import com.skrumble.picketeditor.public_interface.OnCompletion;
 import com.skrumble.picketeditor.utility.PermUtil;
+import com.skrumble.picketeditor.utility.PickerEditorStyleParams;
 
 import static com.skrumble.picketeditor.PickerEditor.RESULT_FILE;
 
 public class MainActivity extends AppCompatActivity {
 
+    private PickerEditorStyleParams mStyleParams = new PickerEditorStyleParams(Color.parseColor("#4285f4"), Color.WHITE);
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        PickerEditor.setGlobalStyleParams(mStyleParams);
     }
 
     @Override
@@ -42,26 +47,26 @@ public void OnVideoPickerClick(View view) {
             PermUtil.checkForCamaraWritePermissions(this, new OnCompletion<Object, Boolean>() {
                 @Override
                 public void onCompleted(Object o, Boolean aBoolean) {
-                    PickerEditor.openVideoGallery(MainActivity.this, 1);
+                    PickerEditor.openVideoGallery(MainActivity.this, 1, mStyleParams);
                 }
             });
             return;
         }
 
-        PickerEditor.openVideoGallery(MainActivity.this, 1);
+        PickerEditor.openVideoGallery(MainActivity.this, 1, mStyleParams);
     }
 
     public void OnImagePickClick(View view) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             PermUtil.checkForCamaraWritePermissions(this, new OnCompletion<Object, Boolean>() {
                 @Override
                 public void onCompleted(Object o, Boolean aBoolean) {
-                    PickerEditor.openPictureGallery(MainActivity.this, 1);
+                    PickerEditor.openPictureGallery(MainActivity.this, 1, mStyleParams);
                 }
             });
             return;
         }
-        PickerEditor.openPictureGallery(MainActivity.this, 1);
+        PickerEditor.openPictureGallery(MainActivity.this, 1, mStyleParams);
     }
 
     public void onCameraClick(View view) {

.idea/codeStyles/Project.xml

@@ -2,44 +2,72 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Color;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.ColorInt;
 import android.support.v4.app.Fragment;
 
 import com.skrumble.picketeditor.activity.FileActivity;
 import com.skrumble.picketeditor.activity.ImageCropActivity;
 import com.skrumble.picketeditor.editor.video.VideoTrimmerActivity;
 import com.skrumble.picketeditor.activity.GalleryActivity;
 import com.skrumble.picketeditor.activity.CameraActivity;
+import com.skrumble.picketeditor.utility.PickerEditorStyleParams;
 
 import static com.skrumble.picketeditor.activity.GalleryActivity.EXTRA_GALLERY_TYPE;
 import static com.skrumble.picketeditor.activity.GalleryActivity.GAlLERY_TYPE_PHOTO_AND_VIDEO;
 import static com.skrumble.picketeditor.activity.GalleryActivity.GAlLERY_TYPE_PICTURE;
 import static com.skrumble.picketeditor.activity.GalleryActivity.GAlLERY_TYPE_VIDEO;
 import static com.skrumble.picketeditor.activity.CameraActivity.SELECTION;
 
+
+
 public class PickerEditor {
 
     public static final String RESULT_FILE = "RESULT_FILE";
 
+    public static final String PICKER_EDITOR_STYLE = "PICKER_EDITOR_STYLE";
+
+    public static void setGlobalStyleParams(PickerEditorStyleParams styleParams) {
+        PickerEditor.sStyleParams = styleParams;
+    }
+
+    private static PickerEditorStyleParams sStyleParams = new PickerEditorStyleParams(Color.parseColor("#d53c27"), Color.WHITE);
+
     // *********************************************************************************************
     // region Picker
 
     public static void openPictureGallery(Activity activity, int requestCode) {
-        openGallery(activity, requestCode, GAlLERY_TYPE_PICTURE);
+        openGallery(activity, requestCode, GAlLERY_TYPE_PICTURE, sStyleParams);
+    }
+
+    public static void openPictureGallery(Activity activity, int requestCode, PickerEditorStyleParams pickerEditorStyleParams) {
+        openGallery(activity, requestCode, GAlLERY_TYPE_PICTURE, pickerEditorStyleParams);
     }
 
     public static void openVideoGallery(Activity activity, int requestCode) {
-        openGallery(activity, requestCode, GAlLERY_TYPE_VIDEO);
+        openGallery(activity, requestCode, GAlLERY_TYPE_VIDEO, sStyleParams);
+    }
+
+    public static void openVideoGallery(Activity activity, int requestCode, PickerEditorStyleParams pickerEditorStyleParams) {
+        openGallery(activity, requestCode, GAlLERY_TYPE_VIDEO, pickerEditorStyleParams);
     }
 
     public static void openPictureAndVideoGallery(Activity activity, int requestCode) {
-        openGallery(activity, requestCode, GAlLERY_TYPE_PHOTO_AND_VIDEO);
+        openGallery(activity, requestCode, GAlLERY_TYPE_PHOTO_AND_VIDEO, sStyleParams);
     }
 
-    private static void openGallery(Activity activity, int requestCode, int typeOfGallery) {
+    public static void openPictureAndVideoGallery(Activity activity, int requestCode, PickerEditorStyleParams pickerEditorStyleParams) {
+        openGallery(activity, requestCode, GAlLERY_TYPE_PHOTO_AND_VIDEO, pickerEditorStyleParams);
+    }
+
+    private static void openGallery(Activity activity, int requestCode, int typeOfGallery, PickerEditorStyleParams pickerEditorStyleParams) {
         PickerEditorConfig.updateScreenSize(activity);
 
         Intent intent = new Intent(activity, GalleryActivity.class);
         intent.putExtra(EXTRA_GALLERY_TYPE, typeOfGallery);
+        intent.putExtra(PICKER_EDITOR_STYLE, pickerEditorStyleParams);
         activity.startActivityForResult(intent, requestCode);
     }
 
@@ -153,7 +181,12 @@ public static void starVideoEditorForResult(Activity activity, String originalVi
     // region File
 
     public static void pickFile(Activity activity, int requestCode){
+        pickFile(activity, requestCode, sStyleParams);
+    }
+
+    public static void pickFile(Activity activity, int requestCode, PickerEditorStyleParams pickerEditorStyleParams){
         Intent intent = new Intent(activity, FileActivity.class);
+        intent.putExtra(PICKER_EDITOR_STYLE, pickerEditorStyleParams);
         activity.startActivityForResult(intent, requestCode);
     }
 

app/src/main/java/com/skrumble/imagepicketeditor/MainActivity.java

@@ -10,6 +10,7 @@
 import android.support.annotation.Nullable;
 import android.support.design.widget.TabLayout;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.graphics.ColorUtils;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
@@ -29,18 +30,23 @@
 import com.skrumble.picketeditor.enumeration.GalleryType;
 import com.skrumble.picketeditor.model.Media;
 import com.skrumble.picketeditor.public_interface.OnCompletion;
+import com.skrumble.picketeditor.utility.PickerEditorStyleParams;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static com.skrumble.picketeditor.PickerEditor.PICKER_EDITOR_STYLE;
+
 public class FileActivity extends AppCompatActivity implements TabLayout.BaseOnTabSelectedListener, SearchView.OnQueryTextListener {
 
     private Toolbar toolbar;
     private TabLayout tabLayout;
     private RecyclerView recyclerView;
     FileAdapter fileAdapter;
 
+    private PickerEditorStyleParams mStyleParams;
+
     private TabLayout.Tab currentTab;
 
     private ArrayList<Media> mediaArrayList = new ArrayList<>();
@@ -50,12 +56,21 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_file);
+
+        mStyleParams = getIntent().getParcelableExtra(PICKER_EDITOR_STYLE);
+
         setupAppBar();
 
         setTitle(R.string.attachement);
 
         tabLayout = findViewById(R.id.tab_layout);
 
+        if (mStyleParams != null) {
+            tabLayout.setTabTextColors(ColorUtils.setAlphaComponent(mStyleParams.getAccentColor(), 255/2), mStyleParams.getAccentColor());
+            tabLayout.setSelectedTabIndicatorColor(mStyleParams.getAccentColor());
+        }
+
+
         for (FileTypeTab typeTab: FileTypeTab.values()){
             tabLayout.addTab(tabLayout.newTab().setText(typeTab.title));
         }
@@ -108,8 +123,13 @@ public void onClick(View v) {
             }
         });
 
+
+
         // Set all of the Toolbar coloring
-        toolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.ally_accent_color));
+        if (mStyleParams != null) {
+            toolbar.setBackgroundColor(mStyleParams.getAccentColor());
+            toolbar.setTitleTextColor(mStyleParams.getTitleColor());
+        }
 
         toolbar.setVisibility(View.VISIBLE);
 

picketeditor/src/main/java/com/skrumble/picketeditor/PickerEditor.java

@@ -31,9 +31,12 @@
 import com.skrumble.picketeditor.model.Media;
 import com.skrumble.picketeditor.public_interface.OnClickAction;
 import com.skrumble.picketeditor.public_interface.OnCompletion;
+import com.skrumble.picketeditor.utility.PickerEditorStyleParams;
 
 import java.util.ArrayList;
 
+import static com.skrumble.picketeditor.PickerEditor.PICKER_EDITOR_STYLE;
+
 public class GalleryActivity  extends AppCompatActivity implements OnClickAction<Media> {
 
     public static final String EXTRA_GALLERY_TYPE = "GALLERY_TYPE";
@@ -50,6 +53,8 @@ public class GalleryActivity  extends AppCompatActivity implements OnClickAction
     private MediaGridAdapter mediaGridAdapter;
     private Toolbar toolbar;
 
+    private PickerEditorStyleParams mStyleParams;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -88,7 +93,7 @@ public void onClick(View v) {
     private void setGalleryType(Intent intent) {
 
         int intExtra = intent.getIntExtra(EXTRA_GALLERY_TYPE, GAlLERY_TYPE_PHOTO_AND_VIDEO);
-
+        mStyleParams = intent.getParcelableExtra(PICKER_EDITOR_STYLE);
         galleryType = GalleryType.getGalleryTypeFromInt(intExtra);
 
         setTitle(galleryType.title);
@@ -131,7 +136,10 @@ private void setupAppBar() {
         toolbar = findViewById(R.id.toolbar);
 
         // Set all of the Toolbar coloring
-        toolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.ally_accent_color));
+        if (mStyleParams != null) {
+            toolbar.setBackgroundColor(mStyleParams.getAccentColor());
+            toolbar.setTitleTextColor(mStyleParams.getTitleColor());
+        }
 
         toolbar.setVisibility(View.VISIBLE);