Skip to content

Commit

Permalink
Merge pull request #31 from vishal0071/master
Browse files Browse the repository at this point in the history
lots of changes
  • Loading branch information
arpitkh96 committed Nov 10, 2014
2 parents dde09d7 + fa10d52 commit 438ff07
Show file tree
Hide file tree
Showing 16 changed files with 367 additions and 414 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ dependencies {
compile 'com.pkmmte.view:circularimageview:1.1'
compile fileTree(dir: 'libs', include: '*.jar')
compile files('libs/RootTools')
compile files('libs/FloatingActionButton')
compile files('nineoldandroids-2.4.0')
}

Expand Down
Binary file removed libs/FloatingActionButton.jar
Binary file not shown.
67 changes: 67 additions & 0 deletions res/layout/authors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginLeft="5dp">

<TextView
android:id="@+id/name1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.Medium"
android:textStyle="bold"
android:text="Arpit Khurana"/>
<TextView
android:id="@+id/git1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/name1"
android:layout_marginTop="5dp"
style="@style/TextAppearance.Small"
android:text="Github"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/git1"
android:layout_below="@+id/name1"
android:layout_marginLeft="10dp"
style="@style/TextAppearance.Small"
android:text="Google+"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
android:id="@+id/name2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.Medium"
android:textStyle="bold"
android:text="Vishal Nehra"/>
<TextView
android:id="@+id/git2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/name2"
android:layout_marginTop="5dp"
style="@style/TextAppearance.Small"
android:text="Github"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/git2"
android:layout_below="@+id/name2"
android:layout_marginLeft="10dp"
style="@style/TextAppearance.Small"
android:text="Google+"/>
</RelativeLayout>

</LinearLayout>
45 changes: 45 additions & 0 deletions res/layout/copy_dialog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?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/>.
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">


<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Medium Text"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:id="@+id/textView" />

<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Do for all items"
android:layout_marginLeft="10dp"
android:layout_marginBottom="10dp"
android:id="@+id/checkBox" />
</LinearLayout>
18 changes: 10 additions & 8 deletions res/layout/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:clickable="false"
android:layout_width="wrap_content"
android:textSize="18sp"
style="@android:style/TextAppearance.Large"
android:textColor="@android:color/white"
android:layout_height="wrap_content"
android:id="@+id/pathname" />
<HorizontalScrollView
android:scrollbars="none"
android:clickable="false"
android:id="@+id/scroll1"
android:layout_width="fill_parent"
android:layout_marginBottom="5dp"
android:layout_height="wrap_content">

<TextView
Expand All @@ -165,6 +158,15 @@
android:layout_height="wrap_content"
android:id="@+id/fullpath" />
</HorizontalScrollView>
<TextView
android:clickable="false"
android:layout_width="wrap_content"
android:layout_gravity="right"
android:textSize="10dp"
android:textColor="@android:color/white"
android:layout_height="wrap_content"
android:layout_marginRight="7dp"
android:id="@+id/pathname" />
</LinearLayout>
</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion res/layout/rowlayout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3dip"
android:layout_marginRight="5dip"
android:textSize="12sp"
android:textColor="?android:attr/textColorTertiary"
/>
Expand Down
1 change: 1 addition & 0 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<string name="setting">Settings</string>
<string name="select">Select Item</string>
<string name="pressagain">Press again to exit</string>
<string name="open">Open</string>
<string name="backup">Backup</string>
<string name="uninstall">Uninstall</string>
<string name="play">Play store</string>
Expand Down
3 changes: 3 additions & 0 deletions res/xml/preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@
<PreferenceCategory android:title="About">
<PreferenceScreen
android:title="About Amaze File Manager" >
<Preference
android:key="authors"
android:title="Authors" />
<Preference
android:title="Version"
android:summary="v0.x"/>
Expand Down
Loading

0 comments on commit 438ff07

Please sign in to comment.