diff --git a/app/app.iml b/app/app.iml
index b2bb070..1fba806 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -80,6 +80,7 @@
+
@@ -110,6 +111,7 @@
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0aab3fb..df731c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.javiersantos.mlmanager"
minSdkVersion 15
targetSdkVersion 22
- versionCode 9
- versionName "0.3.1"
+ versionCode 10
+ versionName "0.4.0"
}
buildTypes {
release {
@@ -31,6 +31,7 @@ dependencies {
compile 'com.afollestad:material-dialogs:0.7.5.5'
compile 'com.github.yukuku:ambilwarna:2.0'
compile 'com.pnikosis:materialish-progress:1.5'
+ compile 'xyz.danoz:recyclerviewfastscroller:0.1.3'
compile('com.mikepenz:materialdrawer:3.0.6@aar') {
transitive = true
}
diff --git a/app/src/main/java/com/javiersantos/mlmanager/activities/AboutActivity.java b/app/src/main/java/com/javiersantos/mlmanager/activities/AboutActivity.java
index 520b6e7..534f687 100644
--- a/app/src/main/java/com/javiersantos/mlmanager/activities/AboutActivity.java
+++ b/app/src/main/java/com/javiersantos/mlmanager/activities/AboutActivity.java
@@ -1,7 +1,5 @@
package com.javiersantos.mlmanager.activities;
-import android.content.Intent;
-import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
diff --git a/app/src/main/java/com/javiersantos/mlmanager/activities/MainActivity.java b/app/src/main/java/com/javiersantos/mlmanager/activities/MainActivity.java
index 52a9f62..095e02e 100644
--- a/app/src/main/java/com/javiersantos/mlmanager/activities/MainActivity.java
+++ b/app/src/main/java/com/javiersantos/mlmanager/activities/MainActivity.java
@@ -1,7 +1,6 @@
package com.javiersantos.mlmanager.activities;
import android.content.Context;
-import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
@@ -20,11 +19,9 @@
import com.javiersantos.mlmanager.AppInfo;
import com.javiersantos.mlmanager.R;
import com.javiersantos.mlmanager.adapters.AppAdapter;
-import com.javiersantos.mlmanager.listeners.HidingScrollListener;
import com.javiersantos.mlmanager.utils.AppPreferences;
import com.javiersantos.mlmanager.utils.UtilsApp;
import com.javiersantos.mlmanager.utils.UtilsUI;
-import com.melnykov.fab.FloatingActionButton;
import com.pnikosis.materialishprogress.ProgressWheel;
import java.io.File;
@@ -33,6 +30,8 @@
import java.util.Comparator;
import java.util.List;
+import xyz.danoz.recyclerviewfastscroller.vertical.VerticalRecyclerViewFastScroller;
+
public class MainActivity extends AppCompatActivity {
// Load Settings
@@ -60,7 +59,7 @@ public class MainActivity extends AppCompatActivity {
private Toolbar toolbar;
private Context context;
private RecyclerView recyclerView;
- private FloatingActionButton fab;
+ private VerticalRecyclerViewFastScroller fastScroller;
private ProgressWheel progressWheel;
@Override
@@ -74,15 +73,18 @@ protected void onCreate(Bundle savedInstanceState) {
setAppDir();
recyclerView = (RecyclerView) findViewById(R.id.appList);
+ fastScroller = (VerticalRecyclerViewFastScroller) findViewById(R.id.fast_scroller);
progressWheel = (ProgressWheel) findViewById(R.id.progress);
+ fastScroller.setRecyclerView(recyclerView);
+ recyclerView.setOnScrollListener(fastScroller.getOnScrollListener());
+
recyclerView.setHasFixedSize(true);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
recyclerView.setLayoutManager(linearLayoutManager);
setNavigationDrawer(appAdapter, appSystemAdapter, recyclerView);
- setFAB();
progressWheel.setBarColor(appPreferences.getPrimaryColorPref());
progressWheel.setVisibility(View.VISIBLE);
@@ -109,36 +111,6 @@ private void setNavigationDrawer(AppAdapter appAdapter, AppAdapter appSystemAdap
UtilsUI.setNavigationDrawer(this, getApplicationContext(), toolbar, appAdapter, appSystemAdapter, recyclerView);
}
- private void setFAB() {
- fab = (FloatingActionButton) findViewById(R.id.fab);
- if (appPreferences.getFABShowPref()) {
- fab.setVisibility(View.VISIBLE);
- fab.setImageDrawable(getResources().getDrawable(R.drawable.ic_settings));
- fab.setBackgroundColor(appPreferences.getFABColorPref());
- fab.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- startActivity(new Intent(getApplicationContext(), SettingsActivity.class));
- overridePendingTransition(R.anim.slide_in_right, R.anim.fade_back);
- }
- });
-
- recyclerView.setOnScrollListener(new HidingScrollListener() {
- @Override
- public void onHide() {
- fab.hide();
- }
-
- @Override
- public void onShow() {
- fab.show();
- }
- });
- } else {
- fab.setVisibility(View.INVISIBLE);
- }
- }
-
class getInstalledApps extends AsyncTask {
public getInstalledApps() {}
@@ -234,6 +206,7 @@ protected void onPostExecute(Void aVoid) {
appAdapter = new AppAdapter(createList(appListName, appListAPK, appListVersion, appListSource, appListData, appListIcon, false), context);
appSystemAdapter = new AppAdapter(createList(appSystemListName, appSystemListAPK, appSystemListVersion, appSystemListSource, appSystemListData, appSystemListIcon, true), context);
+ fastScroller.setVisibility(View.VISIBLE);
recyclerView.setAdapter(appAdapter);
progressWheel.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/javiersantos/mlmanager/activities/SettingsActivity.java b/app/src/main/java/com/javiersantos/mlmanager/activities/SettingsActivity.java
index 818269f..897945e 100644
--- a/app/src/main/java/com/javiersantos/mlmanager/activities/SettingsActivity.java
+++ b/app/src/main/java/com/javiersantos/mlmanager/activities/SettingsActivity.java
@@ -5,7 +5,6 @@
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
@@ -27,7 +26,6 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
private SharedPreferences prefs;
private Preference prefVersion, prefDeleteAll, prefDefaultValues, prefNavigationBlack;
private AmbilWarnaPreference prefPrimaryColor, prefFABColor;
- private CheckBoxPreference prefFABShow;
private ListPreference prefCustomFilename, prefSortMode;
private String versionName;
private int versionCode;
@@ -46,7 +44,6 @@ public void onCreate(Bundle savedInstanceState) {
prefVersion = findPreference("prefVersion");
prefPrimaryColor = (AmbilWarnaPreference) findPreference("prefPrimaryColor");
prefFABColor = (AmbilWarnaPreference) findPreference("prefFABColor");
- prefFABShow = (CheckBoxPreference) findPreference("prefFABShow");
prefDeleteAll = findPreference("prefDeleteAll");
prefDefaultValues = findPreference("prefDefaultValues");
prefNavigationBlack = findPreference("prefNavigationBlack");
@@ -97,7 +94,6 @@ public boolean onPreferenceClick(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
appPreferences.setPrimaryColorPref(getResources().getColor(R.color.primary));
appPreferences.setFABColorPref(getResources().getColor(R.color.fab));
- prefFABShow.setChecked(false);
return true;
}
});
diff --git a/app/src/main/java/com/javiersantos/mlmanager/utils/UtilsApp.java b/app/src/main/java/com/javiersantos/mlmanager/utils/UtilsApp.java
index 946f888..b7f16be 100644
--- a/app/src/main/java/com/javiersantos/mlmanager/utils/UtilsApp.java
+++ b/app/src/main/java/com/javiersantos/mlmanager/utils/UtilsApp.java
@@ -4,7 +4,6 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Environment;
-import android.util.Log;
import com.javiersantos.mlmanager.AppInfo;
diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png
deleted file mode 100644
index f6e2693..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png
deleted file mode 100644
index d4c1d97..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png
deleted file mode 100644
index 6c2d5cc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png
deleted file mode 100644
index b8f19b0..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable/fastscroller_rounded.xml b/app/src/main/res/drawable/fastscroller_rounded.xml
new file mode 100644
index 0000000..db15982
--- /dev/null
+++ b/app/src/main/res/drawable/fastscroller_rounded.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 5be7f71..4df9beb 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,7 +1,6 @@
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/activity_app.xml b/app/src/main/res/layout/activity_app.xml
index ec7bcce..8575655 100644
--- a/app/src/main/res/layout/activity_app.xml
+++ b/app/src/main/res/layout/activity_app.xml
@@ -1,6 +1,6 @@
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7862427..aecdaa8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,38 +1,44 @@
+ xmlns:recyclerviewfastscroller="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
-
+ android:layout_height="match_parent"
+ android:layout_marginRight="25dp" />
+
-
-
-
+ recyclerviewfastscroller:rfs_barColor="@color/transparent"
+ recyclerviewfastscroller:rfs_handleBackground="@drawable/fastscroller_rounded"/>
+
+
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d40455a..1f30bb8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -47,8 +47,6 @@
Moderno, sencillo y personalizable gestor de aplicaciones para Android
Únete a la comunidad en Google+
¿Quieres estar al tanto de las novedades de la aplicación? ¡Únete a nuestra comunidad!
- Mostrar botón flotante principal
- No ocultar el butón flotante (FAB) en la pantalla principal. Requiere reiniciar.
Nombre de los archivos APK extraídos
Ordenar aplicaciones por
Aplicaciones Instaladas
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5761b40..6ebc78f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,8 +48,6 @@
Set the primary color for the toolbar and navigation bar. Requires Android 5.0+
Floating button color
Set the color for the Floating Action Button (FAB)
- Show floating button on main screen
- Don\'t hide the Floating Action Button (FAB) on the main screen. Restart required.
Show navigation bar in black
Don\'t use a custom color for the navigation bar.
Restore customizations
diff --git a/app/src/main/res/xml/activity_settings.xml b/app/src/main/res/xml/activity_settings.xml
index a28b22a..4d00855 100644
--- a/app/src/main/res/xml/activity_settings.xml
+++ b/app/src/main/res/xml/activity_settings.xml
@@ -37,11 +37,6 @@
android:defaultValue="@color/fab"
android:title="@string/settings_fab_color"
android:summary="@string/settings_fab_color_description"/>
-