From 961d2fc990932a74cd43d7da3f9ca32059f10bae Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com> Date: Sun, 20 Aug 2017 09:44:36 +0200 Subject: [PATCH] 6.2a --- app/build.gradle | 4 +++- app/src/main/java/ohi/andre/consolelauncher/MainManager.java | 3 +++ app/src/main/java/ohi/andre/consolelauncher/UIManager.java | 2 +- build.gradle | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8885ed7..f228dd0 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply plugin: 'com.google.gms.google-services' android { compileSdkVersion 25 @@ -7,7 +8,7 @@ android { defaultConfig { applicationId "ohi.andre.consolelauncher" - minSdkVersion 8 + minSdkVersion 9 targetSdkVersion 23 versionCode 122 @@ -50,4 +51,5 @@ android { } dependencies { compile files('libs/anrwatchdog-1.3.0.jar') + compile 'com.google.firebase:firebase-database:9.0.0' } \ No newline at end of file diff --git a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java index d0e9bb3..3a97b3b 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java +++ b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java @@ -21,6 +21,7 @@ import ohi.andre.consolelauncher.managers.AliasManager; import ohi.andre.consolelauncher.managers.AppsManager; import ohi.andre.consolelauncher.managers.ContactManager; import ohi.andre.consolelauncher.managers.TerminalManager; +import ohi.andre.consolelauncher.managers.ThemesManager; import ohi.andre.consolelauncher.managers.XMLPrefsManager; import ohi.andre.consolelauncher.managers.music.MusicManager2; import ohi.andre.consolelauncher.tuils.StoppableThread; @@ -118,6 +119,8 @@ public class MainManager { multipleCmdSeparator = XMLPrefsManager.get(String.class, XMLPrefsManager.Behavior.multiple_cmd_separator); + new ThemesManager(); + CommandGroup group = new CommandGroup(mContext, COMMANDS_PKG); ContactManager cont = null; diff --git a/app/src/main/java/ohi/andre/consolelauncher/UIManager.java b/app/src/main/java/ohi/andre/consolelauncher/UIManager.java index 82c9063..7947c4d 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/UIManager.java +++ b/app/src/main/java/ohi/andre/consolelauncher/UIManager.java @@ -194,7 +194,7 @@ public class UIManager implements OnTouchListener { copy = storagePatterns.get(11).matcher(copy).replaceAll(Matcher.quoteReplacement(String.valueOf(Tuils.formatSize((long) eav, Tuils.TERA)))); copy = storagePatterns.get(12).matcher(copy).replaceAll(Matcher.quoteReplacement(String.valueOf(Tuils.formatSize((long) eav, Tuils.GIGA)))); - copy = storagePatterns.get(14).matcher(copy).replaceAll(Matcher.quoteReplacement(String.valueOf(Tuils.formatSize((long) eav, Tuils.MEGA)))); + copy = storagePatterns.get(13).matcher(copy).replaceAll(Matcher.quoteReplacement(String.valueOf(Tuils.formatSize((long) eav, Tuils.MEGA)))); copy = storagePatterns.get(14).matcher(copy).replaceAll(Matcher.quoteReplacement(String.valueOf(Tuils.formatSize((long) eav, Tuils.KILO)))); copy = storagePatterns.get(15).matcher(copy).replaceAll(Matcher.quoteReplacement(String.valueOf(Tuils.formatSize((long) eav, Tuils.BYTE)))); copy = storagePatterns.get(16).matcher(copy).replaceAll(Matcher.quoteReplacement(String.valueOf(Tuils.percentage(eav, etot)))); diff --git a/build.gradle b/build.gradle index 5954279..5bbec01 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.google.gms:google-services:3.1.0' } } -- GitLab