Code & File Clean

UnevenSoftware · Jun 15, 2016 · 3182586 · 3182586
1 parent 9254640
commit 3182586
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 19 deletions.
diff --git a/app/src/main/assets/fonts/Hipstelvetica Bold.ttf b/app/src/main/assets/fonts/Hipstelvetica Bold.ttf
diff --git a/app/src/main/assets/fonts/Hipstelvetica Light.ttf b/app/src/main/assets/fonts/Hipstelvetica Light.ttf
diff --git a/app/src/main/assets/fonts/Hipstelvetica UltraLight.ttf b/app/src/main/assets/fonts/Hipstelvetica UltraLight.ttf
diff --git a/app/src/main/assets/fonts/Margot-BoldItalic.ttf b/app/src/main/assets/fonts/Margot-BoldItalic.ttf
diff --git a/app/src/main/assets/fonts/Metrica-Regular.otf b/app/src/main/assets/fonts/Metrica-Regular.otf
diff --git a/app/src/main/java/com/horaapps/leafpic/AboutActivity.java b/app/src/main/java/com/horaapps/leafpic/AboutActivity.java
@@ -153,7 +153,6 @@ public void onClick(View v) {
         ((TextView) findViewById(R.id.about_author_gilbert_googleplus_item)).setTextColor(color);
         ((TextView) findViewById(R.id.about_author_gilbert_github_item)).setTextColor(color);
 
-
         /***** ScrolView *****/
         setScrollViewColor(scr);
 

diff --git a/app/src/main/java/com/horaapps/leafpic/PhotoPagerActivity.java b/app/src/main/java/com/horaapps/leafpic/PhotoPagerActivity.java
@@ -303,7 +303,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     } else
                         StringUtils.showToast(getApplicationContext(), "errori random");
                     break;
-
                 default:
                     break;
             }
@@ -598,7 +597,6 @@ private UCrop.Options getUcropOptions() {
         return options;
     }
 
-
     @Override
     public void setNavBarColor() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -612,7 +610,6 @@ public void setNavBarColor() {
         }
     }
 
-
     @Override
     protected void setStatusBarColor() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

diff --git a/app/src/main/java/com/horaapps/leafpic/SelectAlbumBottomSheet.java b/app/src/main/java/com/horaapps/leafpic/SelectAlbumBottomSheet.java
@@ -201,7 +201,7 @@ private void newFolderDialog() {
         IconicsImageView btnUP;
         final ListView dialog_ListView;
 
-        View dialogLayout = getLayoutInflater().inflate(R.layout.dialog explorer, null);
+        View dialogLayout = getLayoutInflater().inflate(R.layout.dialog_explorer, null);
 
         final TextView textViewCurrentPath = (TextView) dialogLayout.findViewById(R.id.current_path);
         btnUP = (IconicsImageView) dialogLayout.findViewById(R.id.directory_up);

diff --git a/app/src/main/java/com/horaapps/leafpic/SplashScreen.java b/app/src/main/java/com/horaapps/leafpic/SplashScreen.java
@@ -66,7 +66,6 @@ public void run() {
         albums = new HandlingAlbums(getApplicationContext());
 
         TextView logo = (TextView) findViewById(R.id.txtLogo);
-        //logo.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/Metrica-Regular.otf"));
         logo.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/Figa.ttf"));
         //logo.setPadding(0,0,0,25+ Measure.getNavBarHeight(getApplicationContext()));
         //logo.animate().translationY(-Measure.getNavBarHeight(getApplicationContext())).start();

diff --git a/app/src/main/java/com/horaapps/leafpic/Views/ThemedActivity.java b/app/src/main/java/com/horaapps/leafpic/Views/ThemedActivity.java
@@ -104,8 +104,7 @@ protected int getInvertedBackgroundColor(){
         int color;
         switch (basicTheme){
             case DARK_THEME:color = ContextCompat.getColor(getApplicationContext(), R.color.md_light_background);break;
-            case AMOLED_THEME:color = ContextCompat.getColor(getApplicationContext(), R.color
-                    .md_light_background);break;
+            case AMOLED_THEME:color = ContextCompat.getColor(getApplicationContext(), R.color.md_light_background);break;
             case LIGHT_THEME:
             default:color = ContextCompat.getColor(getApplicationContext(), R.color.md_black_1000);
         }
@@ -127,8 +126,7 @@ public int getSubTextColor(){
         int color;
         switch (basicTheme){
             case DARK_THEME:color = ContextCompat.getColor(getApplicationContext(), R.color.md_grey_400);break;
-            case AMOLED_THEME:color = ContextCompat.getColor(getApplicationContext(), R.color.md_grey_400);
-                break;
+            case AMOLED_THEME:color = ContextCompat.getColor(getApplicationContext(), R.color.md_grey_400);break;
             case LIGHT_THEME:
             default:color = ContextCompat.getColor(getApplicationContext(), R.color.md_grey_600);
         }
@@ -148,8 +146,8 @@ public int getCardBackgroundColor(){
     public int getIconColor(){
         int color;
         switch (basicTheme){
-            case DARK_THEME:case AMOLED_THEME:color = ContextCompat.getColor(getApplicationContext(), R.color.md_white_1000);break;
-            case LIGHT_THEME:default:color = ContextCompat.getColor(getApplicationContext(), R.color.md_light_primary_icon);
+            case DARK_THEME: case AMOLED_THEME: color = ContextCompat.getColor(getApplicationContext(), R.color.md_white_1000);break;
+            case LIGHT_THEME: default: color = ContextCompat.getColor(getApplicationContext(), R.color.md_light_primary_icon);
         }
         return color;
     }
@@ -185,7 +183,6 @@ protected int getPopupToolbarStyle(){
         return style;
     }
 
-
     protected ArrayAdapter<String> getSpinnerAdapter(ArrayList<String> items) {
         switch (getBaseTheme()){
             case AMOLED_THEME:
@@ -194,7 +191,6 @@ protected ArrayAdapter<String> getSpinnerAdapter(ArrayList<String> items) {
         }
     }
 
-
     protected int getDefaultThemeToolbarColor3th(){
         int color;
         switch (basicTheme){
@@ -283,9 +279,7 @@ protected void setScrollViewColor(ScrollView scr){
 
             ColorDrawable ColorDraw = new ColorDrawable(getPrimaryColor());
             method.invoke(scrollBar, ColorDraw);
-        }
-        catch(Exception e)
-        {
+        } catch(Exception e) {
             e.printStackTrace();
         }
     }
@@ -323,12 +317,11 @@ public void updateTheme(){
         applyThemeImgAct = SP.getBoolean(getString(R.string.preference_apply_theme_pager), true);
     }
 
-
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void setRecentApp(String text){
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             BitmapDrawable drawable = ((BitmapDrawable) getDrawable(R.mipmap.ic_launcher));
             setTaskDescription(new ActivityManager.TaskDescription(text, drawable.getBitmap(), getPrimaryColor()));
         }
     }
-}
+}