Improved UI

Play-Store-Mauricio-Togneri · Sep 11, 2016 · 5d88e17 · 5d88e17
1 parent 90c4f7b
commit 5d88e17
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,10 @@
-# generated files
-bin/
-gen/
-
 # Local configuration file (sdk path, etc)
 local.properties
 gradle.properties
 
 # Android Studio
 /.idea
 **/*.iml
-/captures
-
-# OSX files
-.DS_Store
 
 # Ignore gradle files
 .gradle

diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/adapters/FolderAdapter.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/adapters/FolderAdapter.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -86,6 +87,15 @@ else if (fileInfo.isVideo())
                 {
                     viewHolder.extension.setText(extension);
                     viewHolder.extension.setBackgroundResource(R.drawable.extension_border);
+
+                    if (extension.length() <= 3)
+                    {
+                        viewHolder.extension.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9);
+                    }
+                    else
+                    {
+                        viewHolder.extension.setTextSize(TypedValue.COMPLEX_UNIT_SP, 8);
+                    }
                 }
                 else
                 {
@@ -97,7 +107,7 @@ else if (fileInfo.isVideo())
 
         if (fileInfo.isSelected())
         {
-            rowView.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.gray5));
+            rowView.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.gray4));
         }
         else
         {

diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java
@@ -34,7 +34,7 @@
 
 public class FolderFragment extends Fragment
 {
-    private static final String PARAMETER_FOLDER_PATH = "folder_path";
+    private static final String PARAMETER_FOLDER_PATH = "folder.path";
 
     private MainActivity mainActivity;
     private ListView listView;

diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/utils/FileInfo.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/utils/FileInfo.java
@@ -223,7 +223,7 @@ public String extension()
             {
                 String extension = name.substring(index + 1);
 
-                if (extension.length() <= 3)
+                if (extension.length() <= 4)
                 {
                     cachedExtension = extension.toUpperCase();
                 }

diff --git a/app/src/main/res/drawable/extension_border.xml b/app/src/main/res/drawable/extension_border.xml
@@ -11,6 +11,6 @@
 
     <stroke
         android:width="2px"
-        android:color="@color/gray3"/>
+        android:color="@color/gray2"/>
 
 </shape>
diff --git a/app/src/main/res/layout/row_file.xml b/app/src/main/res/layout/row_file.xml
@@ -57,7 +57,7 @@
             style="@style/defaultText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray3"
+            android:textColor="@color/gray2"
             android:textSize="14sp"
             tools:text="@string/dummy_text"/>
 

diff --git a/app/src/main/res/layout/screen_folder.xml b/app/src/main/res/layout/screen_folder.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@android:color/white"
-        android:divider="@color/gray4"
+        android:divider="@color/gray3"
         android:dividerHeight="0.2dp"/>
 
     <TextView

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -2,10 +2,9 @@
 <resources>
 
     <color name="gray1">#666666</color>
-    <color name="gray2">#888888</color>
-    <color name="gray3">#AAAAAA</color>
-    <color name="gray4">#CCCCCC</color>
-    <color name="gray5">#DDDDDD</color>
+    <color name="gray2">#AAAAAA</color>
+    <color name="gray3">#CCCCCC</color>
+    <color name="gray4">#DDDDDD</color>
 
     <color name="blue1">#0075A8</color>
     <color name="blue2">#0081BA</color>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -20,7 +20,7 @@
 
     <style name="dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="colorAccent">@color/blue2</item>
-        <item name="android:textColorPrimary">@color/gray2</item>
+        <item name="android:textColorPrimary">@color/gray1</item>
         <item name="android:background">@color/white</item>
     </style>