Merge pull request #69 from kaczmarkiewiczp/dev

Update shortcut icons to be adaptive

Author: patrykcoding

.idea/assetWizardSettings.xml

@@ -44,7 +44,6 @@ Credits/Libraries
 -----------------
 - [ExFile Picker](https://github.com/bartwell/ExFilePicker) - Open source Android library. Implement choosing files and directories in your application.
 - [Floating Action Button SpeedDial](https://github.com/leinardi/FloatingActionButtonSpeedDial) - A Floating Action Button Speed Dial implementation for Android that follows the Material Design specification.
-- [Font Awesome Icons](https://fontawesome.com/) - The iconic SVG, font, and CSS toolkit/
 - [Markdown View](https://github.com/falnatsheh/MarkdownView) - MarkdownView is an Android webview with the capablity of loading Markdown text or file and display it as HTML, it uses MarkdownJ and extends Android webview.
 - [Material Design Icons](https://github.com/Templarian/MaterialDesign) - 2200+ Material Design Icons from the Community.
 - [rclone](https://github.com/ncw/rclone) - "rsync for cloud storage"

.idea/caches/build_file_checksums.ser

@@ -6,8 +6,8 @@ android {
         applicationId "ca.pkay.rcloneexplorer"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 12
-        versionName "1.2.3"
+        versionCode 13
+        versionName "1.2.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

README.md

@@ -1,3 +1,6 @@
+### 1.2.4
+* **Update:** App shortcut icons are now adaptive and with color
+
 ### 1.2.3
 * **New:** Files can be shared with Rclone Explorer
 * **New:** Tablet layout

app/build.gradle

@@ -99,12 +99,6 @@ private void createData() {
         libraryLicences.put(floatingActionButtonSpeedDial, "Licensed under Apache-2.0");
         libraryLicenceUrls.put(floatingActionButtonSpeedDial, "https://github.com/leinardi/FloatingActionButtonSpeedDial/blob/master/LICENSE");
 
-        String fontAwesome = "Font Awesome";
-        libraryNames.add(fontAwesome);
-        libraryUrls.put(fontAwesome, "https://fontawesome.com/");
-        libraryLicences.put(fontAwesome, "Licensed under CC BY 4.0");
-        libraryLicenceUrls.put(fontAwesome, "https://fontawesome.com/license");
-
         String markDownView = "MarkDown View";
         libraryNames.add(markDownView);
         libraryUrls.put(markDownView, "https://github.com/falnatsheh/MarkdownView");

app/src/main/assets/changelog.md

@@ -34,6 +34,7 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.InputType;
+import android.util.TypedValue;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
@@ -141,6 +142,10 @@ private void applyTheme() {
             getTheme().applyStyle(R.style.LightTheme, true);
         }
 
+        TypedValue typedValue = new TypedValue();
+        getTheme().resolveAttribute(R.attr.colorPrimaryDark, typedValue, true);
+        getWindow().setStatusBarColor(typedValue.data);
+
         // set recents app color to the primary color
         Bitmap bm = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher_round);
         ActivityManager.TaskDescription taskDesc = new ActivityManager.TaskDescription(getString(R.string.app_name), bm, customPrimaryColor);
@@ -368,29 +373,25 @@ private void addRemoteToShortcutList(RemoteItem remoteItem) {
     private int getRemoteIcon(String remoteType) {
         switch (remoteType) {
             case "crypt":
-                return R.drawable.ic_lock_black;
+                return R.mipmap.ic_shortcut_lock;
             case "amazon cloud drive":
-                return R.drawable.ic_amazon;
-            case "b2":
-                return R.drawable.ic_b2;
+                return R.mipmap.ic_shortcut_amazon;
             case "drive":
-                return R.drawable.ic_google_drive;
+                return R.mipmap.ic_shortcut_drive;
             case "dropbox":
-                return R.drawable.ic_dropbox;
+                return R.mipmap.ic_shortcut_dropbox;
             case "google cloud storage":
-                return R.drawable.ic_google;
+                return R.mipmap.ic_shortcut_google;
             case "onedrive":
-                return R.drawable.ic_onedrive;
+                return R.mipmap.ic_shortcut_onedrive;
             case "s3":
-                return R.drawable.ic_amazon;
-            case "yandex":
-                return R.drawable.ic_yandex;
+                return R.mipmap.ic_shortcut_amazon;
             case "box":
-                return R.drawable.ic_box;
+                return R.mipmap.ic_shortcut_box;
             case "sftp":
-                return R.drawable.ic_terminal;
+                return R.mipmap.ic_shortcut_terminal;
             default:
-                return R.drawable.ic_cloud;
+                return R.mipmap.ic_shortcut_cloud;
         }
     }
 

app/src/main/ic_shortcut_onedrive-web.png

@@ -49,9 +49,6 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, final int positio
             case "amazon cloud drive":
                 holder.ivIcon.setImageDrawable(view.getResources().getDrawable(R.drawable.ic_amazon));
                 break;
-            case "b2":
-                holder.ivIcon.setImageDrawable(view.getResources().getDrawable(R.drawable.ic_b2));
-                break;
             case "drive":
                 holder.ivIcon.setImageDrawable(view.getResources().getDrawable(R.drawable.ic_google_drive));
                 break;
@@ -67,9 +64,6 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, final int positio
             case "s3":
                 holder.ivIcon.setImageDrawable(view.getResources().getDrawable(R.drawable.ic_amazon));
                 break;
-            case "yandex":
-                holder.ivIcon.setImageDrawable(view.getResources().getDrawable(R.drawable.ic_yandex));
-                break;
             case "box":
                 holder.ivIcon.setImageDrawable(view.getResources().getDrawable(R.drawable.ic_box));
                 break;

app/src/main/java/ca/pkay/rcloneexplorer/AboutLibsActivity.java

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="55.151516"
+        android:viewportHeight="55.151516">
+    <group android:translateX="15.320427"
+            android:translateY="15.575758">
+      <path
+          android:pathData="M15.93,17.09C15.75,17.25 15.5,17.26 15.3,17.15C14.41,16.41 14.25,16.07 13.76,15.36C12.29,16.86 11.25,17.31 9.34,17.31C7.09,17.31 5.33,15.92 5.33,13.14C5.33,10.96 6.5,9.5 8.19,8.76C9.65,8.12 11.68,8 13.23,7.83V7.5C13.23,6.84 13.28,6.09 12.9,5.54C12.58,5.05 11.95,4.84 11.4,4.84C10.38,4.84 9.47,5.37 9.25,6.45C9.2,6.69 9,6.93 8.78,6.94L6.18,6.66C5.96,6.61 5.72,6.44 5.78,6.1C6.38,2.95 9.23,2 11.78,2C13.08,2 14.78,2.35 15.81,3.33C17.11,4.55 17,6.18 17,7.95V12.12C17,13.37 17.5,13.93 18,14.6C18.17,14.85 18.21,15.14 18,15.31L15.94,17.09H15.93M13.23,10.56V10C11.29,10 9.24,10.39 9.24,12.67C9.24,13.83 9.85,14.62 10.87,14.62C11.63,14.62 12.3,14.15 12.73,13.4C13.25,12.47 13.23,11.6 13.23,10.56M20.16,19.54C18,21.14 14.82,22 12.1,22C8.29,22 4.85,20.59 2.25,18.24C2.05,18.06 2.23,17.81 2.5,17.95C5.28,19.58 8.75,20.56 12.33,20.56C14.74,20.56 17.4,20.06 19.84,19.03C20.21,18.87 20.5,19.27 20.16,19.54M21.07,18.5C20.79,18.14 19.22,18.33 18.5,18.42C18.31,18.44 18.28,18.26 18.47,18.12C19.71,17.24 21.76,17.5 22,17.79C22.24,18.09 21.93,20.14 20.76,21.11C20.58,21.27 20.41,21.18 20.5,21C20.76,20.33 21.35,18.86 21.07,18.5Z"
+          android:fillColor="#4caf50"
+          android:fillAlpha="1"/>
+    </group>
+</vector>