Merge pull request #32 from vishal0071/master

Initial release changes
TeamAmaze · Nov 12, 2014 · bb4eb3b · bb4eb3b
2 parents 438ff07 + 9c53a01
commit bb4eb3b
Show file tree

Hide file tree

Showing 25 changed files with 408 additions and 78 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,16 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Arpit Khurana <[email protected]>, Vishal Nehra <[email protected]>
+
+    This file is part of Amaze File Manager.
+
+    Amaze File Manager is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.amaze.filemanager"
     android:versionCode="1"
     android:versionName="1.0" >
-<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <uses-sdk 
         android:minSdkVersion="14" 
         android:targetSdkVersion="15" />
 
     <application
+        android:name=".activities.Amaze"
         android:icon="@drawable/ic_launcher"
         android:label="Amaze File Manager" >
+
+        <!-- Google Analytics Version v4 needs this value for easy tracking -->
+        <meta-data android:name="com.google.android.gms.analytics.globalConfigResource"
+            android:resource="@xml/global_tracker" />
+
         <activity
             android:label="Amaze File Manager"
             android:name=".activities.MainActivity"

diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
 }
 apply plugin: 'com.android.application'
+apply plugin: 'android'
 repositories {
     mavenCentral()
 }
@@ -16,6 +17,7 @@ dependencies {
     compile 'com.pkmmte.view:circularimageview:1.1'
     compile fileTree(dir: 'libs', include: '*.jar')
     compile files('libs/RootTools')
+    compile files('libs/google-play-services')
     compile files('nineoldandroids-2.4.0')
 }
 

diff --git a/libs/google-play-services.jar b/libs/google-play-services.jar
diff --git a/res/layout/authors.xml b/res/layout/authors.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:layout_marginLeft="5dp">
+        android:layout_marginLeft="15dp">
 
         <TextView
             android:id="@+id/name1"
@@ -22,22 +22,28 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/name1"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="15dp"
+            android:textColor="#e91e63"
             style="@style/TextAppearance.Small"
             android:text="Github"/>
         <TextView
+            android:id="@+id/googlePlus1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/git1"
             android:layout_below="@+id/name1"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="15dp"
+            android:textColor="#e91e63"
             style="@style/TextAppearance.Small"
             android:text="Google+"/>
         </RelativeLayout>
     <RelativeLayout
-        android:layout_marginTop="10dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp">
 
         <TextView
             android:id="@+id/name2"
@@ -51,15 +57,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/name2"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="15dp"
+            android:textColor="#e91e63"
             style="@style/TextAppearance.Small"
             android:text="Github"/>
         <TextView
+            android:id="@+id/googlePlus2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/git2"
             android:layout_below="@+id/name2"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="15dp"
+            android:textColor="#e91e63"
             style="@style/TextAppearance.Small"
             android:text="Google+"/>
     </RelativeLayout>

diff --git a/res/layout/dialoginfo.xml b/res/layout/dialoginfo.xml
@@ -23,8 +23,12 @@
     android:orientation="vertical">
 
     <TextView
-        android:layout_width="fill_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/info"
-        android:paddingLeft="5dip" />
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="Medium Text"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:id="@+id/info" />
 </ScrollView>
diff --git a/res/layout/griditem.xml b/res/layout/griditem.xml
@@ -62,8 +62,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right|top"
+                android:layout_marginRight="5dp"
                 android:singleLine="true"
-                android:background="#ffffff"
+                android:textColor="#80000000"
                 android:ellipsize="end"
                 android:textAlignment="viewEnd"
                 style="@style/TextAppearance.Small" />

diff --git a/res/layout/main.xml b/res/layout/main.xml
@@ -144,9 +144,8 @@
                 android:orientation="vertical">
                 <HorizontalScrollView
                     android:scrollbars="none"
-                    android:clickable="false"
                     android:id="@+id/scroll1"
-                    android:layout_width="fill_parent"
+                    android:layout_width="wrap_content"
                     android:layout_marginBottom="5dp"
                     android:layout_height="wrap_content">
 

diff --git a/res/layout/spinner_dropdown_layout.xml b/res/layout/spinner_dropdown_layout.xml
@@ -20,32 +20,36 @@
     -->
 
 
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/spinnerLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-    <TextView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/spinnerText"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="5dp"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="#000"
-        android:singleLine="true"
-        android:layout_weight="25"
-        android:gravity="center_vertical"/>
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/textParent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TextView
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/spinnerText"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="5dp"
+            android:minHeight="?android:attr/listPreferredItemHeightSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="#000"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:maxWidth="120dp"
+            android:gravity="center_vertical"/>
+    </LinearLayout>
 
     <ImageButton
         android:id="@+id/spinnerButton"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         style="?android:borderlessButtonStyle"
         android:src="@drawable/ic_action_cancel"
-        android:layout_weight="1"
-        android:layout_gravity="center_vertical"/>
+        android:layout_alignParentRight="true"/>
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/res/layout/spinner_layout.xml b/res/layout/spinner_layout.xml
@@ -24,23 +24,27 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
-        <TextView
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/spinnerText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeightSmall"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textStyle="bold"
-            android:gravity="center_vertical"/>
+    <TextView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/spinnerText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        style="@android:style/TextAppearance.Medium"
+        android:textColor="#ffffff"
+        android:textStyle="bold"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:maxWidth="150dp"
+        android:gravity="center_vertical"/>
 
         <ImageButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="?android:borderlessButtonStyle"
             android:src="@drawable/spinner_triangle"
             android:clickable="false"
+            android:background="@null"
             android:layout_toRightOf="@id/spinnerText"
             android:layout_gravity="center_vertical"/>
 

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -28,6 +28,7 @@
     <string-array name="theme">
         <item>Light</item>
         <item>Dark</item>
+        <item>Daytime</item>
 
     </string-array>
     <string-array name="skin">

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -102,6 +102,9 @@
     <string name="theme">Theme</string>
     <string name="skin">Skin</string>
     <string name="random">Random Skin</string>
+    <string name="random_summary">Sets random theme at startup</string>
+    <string name="colorize">Colorize Icons</string>
+    <string name="colorize_summary">Sets some icons color different than theme</string>
     <string name="back">Back</string>
     <string name="home">Home</string>
     <string name="paste">Paste</string>
@@ -110,7 +113,7 @@
     <string name="refresh">Refresh</string>
     <string name="copy">Copy</string>
     <string name="rootmode">Root Explorer</string>
-    <string name="rootmodesummary">For rooted device only.Check it only if you are sure about it.</string>
+    <string name="rootmodesummary">For rooted device only. Check it only if you are sure about it.</string>
     <string name="mountsystemsummary">Enable this if you want to edit System Files</string>
     <string name="mountsystem">Mount System Folders as Writable</string>
     <string name="rootfailure">Root Access not granted</string>
@@ -126,7 +129,7 @@
     <string name="usedefaultgallerypath">Use Default Image Gallery Path</string>
 
     <!-- Changelog -->
-    <string name="changelog_version_1">&lt;font color="#524ef8">&lt;b>v0.x&lt;/font>&lt;/b>&lt;i>&lt;font color="#5299f2">&lt;br>Nov x, 2014&lt;/i>&lt;/font>&lt;br>&lt;br></string>
-    <string name="changelog_change_1">&lt;i>- Initial release&lt;/i>&lt;br>&lt;br></string>
+    <string name="changelog_version_1">&lt;font color="#524ef8">&lt;b>v1.0&lt;/font>&lt;/b>&lt;i>&lt;font color="#5299f2">&lt;br>Nov 11, 2014&lt;/i>&lt;/font>&lt;br>&lt;br></string>
+    <string name="changelog_change_1">- Initial release&lt;br>&lt;br></string>
 </resources>
 
diff --git a/res/xml/app_tracker.xml b/res/xml/app_tracker.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- The apps Analytics Tracking Id -->
+<string name="ga_trackingId">UA-50377504-2</string>
+
+    <!-- Percentage of events to include in reports -->
+<string name="ga_sampleFrequency">100.0</string>
+
+    <!-- Enable automatic Activity measurement -->
+<bool name="ga_autoActivityTracking">true</bool>
+
+    <!-- catch and report uncaught exceptions from the app -->
+<bool name="ga_reportUncaughtExceptions">true</bool>
+
+    <!-- How long a session exists before giving up -->
+<integer name="ga_sessionTimeout">-1</integer>
+
+    <!-- If ga_autoActivityTracking is enabled, an alternate screen name can be specified to
+    substitute for the full length canonical Activity name in screen view hit. In order to
+    specify an alternate screen name use an <screenName> element, with the name attribute
+    specifying the canonical name, and the value the alias to use instead. -->
+<screenName name="com.amaze.filemanager">MainActivity</screenName>
+
+    </resources>
diff --git a/res/xml/global_tracker.xml b/res/xml/global_tracker.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- the Local LogLevel for Analytics -->
+<string name="ga_logLevel">verbose</string>
+
+    <!-- how often the dispatcher should fire -->
+<integer name="ga_dispatchPeriod">30</integer>
+
+    <!-- Treat events as test events and don't send to google -->
+<bool name="ga_dryRun">false</bool>
+
+    <!-- The screen names that will appear in reports -->
+<string name="com.amaze.filemanager">MainActivity</string>
+    </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -23,7 +23,7 @@
         <ListPreference
             android:defaultValue="0"
             android:entries="@array/theme"
-            android:entryValues="@array/ints"
+            android:entryValues="@array/ints1"
             android:key="theme"
             android:title="@string/theme" />
         <Preference
@@ -32,10 +32,12 @@
         <CheckBoxPreference
             android:key="coloriseIcons"
             android:checked="true"
-            android:title="Colorise icons" />
+            android:title="@string/colorize"
+            android:summary="@string/colorize_summary" />
         <CheckBoxPreference
             android:key="random"
-            android:title="@string/random" />
+            android:title="@string/random"
+            android:summary="@string/random_summary"/>
         <ListPreference
             android:defaultValue="0"
             android:entries="@array/uimode"
@@ -45,7 +47,7 @@
             android:title="@string/uimode" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="File Explorer">
+    <PreferenceCategory android:title="General">
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="showThumbs"
@@ -105,10 +107,13 @@
                 android:title="Authors" />
             <Preference
                 android:title="Version"
-                android:summary="v0.x"/>
+                android:summary="v1.0"/>
             <Preference
                 android:key="changelog"
                 android:title="Changelog" />
+            <Preference
+                android:key="rate"
+                android:title="Rate the app" />
             <Preference
                 android:key="os"
                 android:title="Open Source Licenses" />