Merge pull request #47 from kaczmarkiewiczp/dev

Clean up and refactor code
patrykcoding · Apr 18, 2018 · 41ca5aa · 41ca5aa
2 parents 0e804a9 + ca9e36c
commit 41ca5aa
Show file tree

Hide file tree

Showing 49 changed files with 306 additions and 288 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "ca.pkay.rcloneexplorer"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 3
-        versionName "0.3.0-alpha"
+        versionCode 4
+        versionName "1.0.0-beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -36,6 +36,7 @@ dependencies {
     implementation "com.mikepenz:iconics-core:3.0.3@aar"
     implementation 'com.mikepenz:community-material-typeface:2.0.46.1@aar'
     implementation 'com.mikepenz:fontawesome-typeface:5.0.6.0@aar'
+    implementation 'com.mikepenz:octicons-typeface:3.2.0.4@aar'
     implementation "com.mikepenz:aboutlibraries:6.0.8"
     implementation 'us.feras.mdv:markdownview:1.1.0'
     testImplementation 'junit:junit:4.12'

diff --git a/app/src/main/assets/changelog.md b/app/src/main/assets/changelog.md
@@ -1,4 +1,13 @@
-### Version 0.3.0-alpha
+### 1.0.0-beta
+***
+First beta release!
+
+* Code refactoring
+
+***
+
+
+### 0.3.0-alpha
 ***
 
 * **New:** Changelog added under About screen

diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java b/app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java
@@ -80,25 +80,25 @@ private void showChangelog() {
     private void showOpenSourceLibraries() {
         new LibsBuilder()
                 .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
-                .withActivityTitle("Credits/Libraries")
+                .withActivityTitle(getString(R.string.credits_libraries))
                 .withAutoDetect(false)
                 .withLibraries()
                 .withExcludedLibraries()
                 .start(this);
     }
 
     private void openAppGitHubLink() {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/kaczmarkiewiczp/rcloneExplorer"));
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github_app_url)));
         startActivity(browserIntent);
     }
 
     private void reportBug() {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/kaczmarkiewiczp/rcloneExplorer/issues/new"));
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github_issue_url)));
         startActivity(browserIntent);
     }
 
     private void openAuthorGitHubLink() {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/kaczmarkiewiczp"));
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github_author_url)));
         startActivity(browserIntent);
     }
 }
diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/BroadcastReceivers/ServeCancelAction.java b/app/src/main/java/ca/pkay/rcloneexplorer/BroadcastReceivers/ServeCancelAction.java
@@ -5,7 +5,6 @@
 import android.content.Intent;
 
 import ca.pkay.rcloneexplorer.Services.StreamingService;
-import ca.pkay.rcloneexplorer.Services.UploadService;
 
 public class ServeCancelAction extends BroadcastReceiver {
 

diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/BroadcastReceivers/UploadCancelAction.java b/app/src/main/java/ca/pkay/rcloneexplorer/BroadcastReceivers/UploadCancelAction.java
@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.content.Intent;
 
-import ca.pkay.rcloneexplorer.Services.DownloadService;
 import ca.pkay.rcloneexplorer.Services.UploadService;
 
 public class UploadCancelAction extends BroadcastReceiver {

diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/FileComparators.java b/app/src/main/java/ca/pkay/rcloneexplorer/FileComparators.java
@@ -48,13 +48,7 @@ public int compare(FileItem fileItem, FileItem t1) {
                     return fileItem.getName().compareTo(t1.getName());
                 }
 
-                if (fileItem.getSize() == t1.getSize()) {
-                    return 0;
-                } else if (fileItem.getSize() > t1.getSize()) {
-                    return -1;
-                } else {
-                    return 1;
-                }
+                return Long.compare(t1.getSize(), fileItem.getSize());
             }
         }
 
@@ -72,13 +66,7 @@ public int compare(FileItem fileItem, FileItem t1) {
                     return fileItem.getName().compareTo(t1.getName());
                 }
 
-                if (fileItem.getSize() == t1.getSize()) {
-                    return 0;
-                } else if (fileItem.getSize() > t1.getSize()) {
-                    return 1;
-                } else {
-                    return -1;
-                }
+                return Long.compare(fileItem.getSize(), t1.getSize());
             }
         }
 
@@ -92,13 +80,7 @@ public int compare(FileItem fileItem, FileItem t1) {
                     return 1;
                 }
 
-                if (fileItem.getModTime() == t1.getModTime()) {
-                    return 0;
-                } else if (fileItem.getModTime() > t1.getModTime()) {
-                    return -1;
-                } else {
-                    return 1;
-                }
+                return Long.compare(t1.getModTime(), fileItem.getModTime());
             }
         }
 
@@ -112,13 +94,7 @@ public int compare(FileItem fileItem, FileItem t1) {
                     return 1;
                 }
 
-                if (fileItem.getModTime() == t1.getModTime()) {
-                    return 0;
-                } else if (fileItem.getModTime() > t1.getModTime()) {
-                    return 1;
-                } else {
-                    return -1;
-                }
+                return Long.compare(fileItem.getModTime(), t1.getModTime());
             }
         }
 }