GithubStar/AmazeFileManager
1
0
Fork 0
mirror of https://github.com/TeamAmaze/AmazeFileManager.git synced 2026-10-24 01:25:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

various fixes for styles

Browse Source 
minor bugs still left
This commit is contained in:
Vishal Nehra
2015-05-24 11:16:10 +05:30
parent 254fffaace
commit b382e8823c
9 changed files with 32 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout-v21/main_toolbar.xml
+2
View File
@@ -230,6 +230,7 @@
android:ellipsize="end"
android:text="@string/apps"
android:clickable="false"
android:textColor="@android:color/black"
android:gravity="center_vertical" />
</RelativeLayout>
<RelativeLayout
@@ -261,6 +262,7 @@
android:ellipsize="end"
android:text="@string/setting"
android:clickable="false"
android:textColor="@android:color/black"
android:gravity="center_vertical" />
</RelativeLayout>
src/main/res/layout/authors.xml
+6 -6
View File
@@ -14,7 +14,7 @@
android:id="@+id/name1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.Medium"
style="@android:style/TextAppearance.Medium"
android:textStyle="bold"
android:text="Arpit Khurana"/>
<TextView
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/name1"
android:layout_marginTop="15dp"
style="@style/TextAppearance.Small"
style="@android:style/TextAppearance.Small"
android:text="Github"/>
<TextView
android:id="@+id/googlePlus1"
@@ -33,7 +33,7 @@
android:layout_below="@+id/name1"
android:layout_marginLeft="20dp"
android:layout_marginTop="15dp"
style="@style/TextAppearance.Small"
style="@android:style/TextAppearance.Small"
android:text="Google+"/>
</RelativeLayout>
<RelativeLayout
@@ -47,7 +47,7 @@
android:id="@+id/name2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.Medium"
style="@android:style/TextAppearance.Medium"
android:textStyle="bold"
android:text="Vishal Nehra"/>
<TextView
@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/name2"
android:layout_marginTop="15dp"
style="@style/TextAppearance.Small"
style="@android:style/TextAppearance.Small"
android:text="Github"/>
<TextView
android:id="@+id/googlePlus2"
@@ -66,7 +66,7 @@
android:layout_below="@+id/name2"
android:layout_marginLeft="20dp"
android:layout_marginTop="15dp"
style="@style/TextAppearance.Small"
style="@android:style/TextAppearance.Small"
android:text="Google+"/>
</RelativeLayout>
src/main/res/layout/griditem.xml
+4 -4
View File
@@ -67,7 +67,7 @@
android:ellipsize="end"
android:textSize="12dp"
android:textAlignment="viewEnd"
style="@style/TextAppearance.Small" />
style="@android:style/TextAppearance.Small" />
</FrameLayout>
@@ -91,7 +91,7 @@
android:textColor="@android:color/black"
android:layout_gravity="start"
android:textAlignment="viewStart"
style="@style/TextAppearance.Medium" />
style="@android:style/TextAppearance.Medium" />
</LinearLayout>
@@ -114,7 +114,7 @@
android:textSize="12dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
style="@style/TextAppearance.Small" />
style="@android:style/TextAppearance.Small" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
@@ -127,7 +127,7 @@
android:textSize="12dp"
android:paddingLeft="5dp"
android:textAlignment="viewStart"
style="@style/TextAppearance.Small" />
style="@android:style/TextAppearance.Small" />
</RelativeLayout>
src/main/res/layout/main_toolbar.xml
+2
View File
@@ -227,6 +227,7 @@
android:ellipsize="end"
android:text="@string/apps"
android:clickable="false"
android:textColor="@android:color/black"
android:gravity="center_vertical" />
</RelativeLayout>
@@ -259,6 +260,7 @@
android:ellipsize="end"
android:text="@string/setting"
android:clickable="false"
android:textColor="@android:color/black"
android:gravity="center_vertical" />
</RelativeLayout>
src/main/res/values-v19/styles.xml
+2 -51
View File
@@ -16,70 +16,21 @@
<resources>
<style name="DarkTheme" parent="android:Theme.Holo">
<item name="android:actionOverflowButtonStyle">@style/OverflowActionModeDark</item>
<item name="android:actionModeBackground">@drawable/action_bar_dark</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_36dp</item>
</style>
<style name="TextAppearance" />
<style name="TextAppearance.Medium">
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.Small">
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
<item name="android:textColor">?android:attr/textColorTertiary</item>
</style>
<style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<item name="android:actionOverflowButtonStyle">@style/OverflowActionMode</item>
<item name="android:actionModeBackground">@drawable/action_bar</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_48dp</item>
<!--<item name="android:dropDownListViewStyle">@style/spinner_style</item>-->
</style>
<style name="OverflowActionModeDark" parent="@android:style/Widget.Holo.ActionButton.Overflow">
<item name="android:src">@drawable/ic_action_overflow</item>
</style>
<style name="OverflowActionMode" parent="@android:style/Widget.Holo.ActionButton.Overflow">
<item name="android:src">@drawable/ic_more_vert_black_48dp</item>
</style>
<style name="spinner_style" parent="android:style/Widget.ListView.DropDown">
<item name="android:divider">@android:color/transparent</item>
<item name="android:dividerHeight">@null</item>
</style>
<style name="secondary_text_appearance">
<item name="android:textSize">12sp</item>
<item name="android:textColor">#99000000</item>
<item name="android:textStyle">normal</item>
</style>
<!-- appCompat -->
<!-- light -->
<style name="appCompatLight" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowTranslucentStatus">true</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeCopyDrawable">@drawable/ic_content_copy_black_36dp</item>
<item name="android:actionModeCutDrawable">@drawable/ic_content_cut_black_36dp</item>
<item name="android:actionModeSelectAllDrawable">@drawable/ic_select_all_black_36dp</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_48dp</item>
<item name="android:actionModePasteDrawable">@drawable/ic_content_paste_black_36dp</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<item name="popup">@style/ThemeOverlay.AppCompat.Light</item>
<item name="toolbar_theme">@style/overflow_white1</item>
<item name="android:actionModeBackground">@color/holo_dark_action_mode</item>
</style>
<style name="customActionMdoe" parent="Widget.AppCompat.ActionMode">
<item name="android:background">@color/holo_dark_action_mode</item>
</style>
<style name="overflow_white1" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:textColorSecondary">#ffffff</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimary">#ffffff</item>
<item name="android:actionModeBackground">@color/toolbar_cab</item>
</style>
<!-- dark -->
src/main/res/values-v20/styles.xml
-99
View File
@@ -1,99 +0,0 @@
<!--
Copyright 2012 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<style name="DarkTheme" parent="android:Theme.Holo">
<item name="android:actionOverflowButtonStyle">@style/OverflowActionModeDark</item>
<item name="android:actionModeBackground">@drawable/action_bar_dark</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_36dp</item>
</style>
<style name="TextAppearance" />
<style name="TextAppearance.Medium">
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.Small">
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
<item name="android:textColor">?android:attr/textColorTertiary</item>
</style>
<style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<item name="android:actionOverflowButtonStyle">@style/OverflowActionMode</item>
<item name="android:actionModeBackground">@drawable/action_bar</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_48dp</item>
<!--<item name="android:dropDownListViewStyle">@style/spinner_style</item>-->
</style>
<style name="OverflowActionModeDark" parent="@android:style/Widget.Holo.ActionButton.Overflow">
<item name="android:src">@drawable/ic_action_overflow</item>
</style>
<style name="OverflowActionMode" parent="@android:style/Widget.Holo.ActionButton.Overflow">
<item name="android:src">@drawable/ic_more_vert_black_48dp</item>
</style>
<style name="spinner_style" parent="android:style/Widget.ListView.DropDown">
<item name="android:divider">@android:color/transparent</item>
<item name="android:dividerHeight">@null</item>
</style>
<style name="secondary_text_appearance">
<item name="android:textSize">12sp</item>
<item name="android:textColor">#99000000</item>
<item name="android:textStyle">normal</item>
</style>
<!-- appCompat -->
<!-- light -->
<style name="appCompatLight" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowTranslucentStatus">true</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeCopyDrawable">@drawable/ic_content_copy_black_36dp</item>
<item name="android:actionModeCutDrawable">@drawable/ic_content_cut_black_36dp</item>
<item name="android:actionModeSelectAllDrawable">@drawable/ic_select_all_black_36dp</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_48dp</item>
<item name="android:actionModePasteDrawable">@drawable/ic_content_paste_black_36dp</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<item name="popup">@style/ThemeOverlay.AppCompat.Light</item>
<item name="toolbar_theme">@style/overflow_white1</item>
</style>
<style name="overflow_white1" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:textColorSecondary">#ffffff</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
</style>
<!-- dark -->
<style name="appCompatDark" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowTranslucentStatus">true</item>
<item name="windowActionModeOverlay">true</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<item name="popup">@style/Theme.AppCompat</item>
<item name="toolbar_theme">@style/overflow_white2</item>
</style>
<style name="overflow_white2" parent="Theme.AppCompat">
<item name="android:textColorSecondary">#ffffff</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:actionModeBackground">@color/toolbar_cab</item>
</style>
<style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
<item name="spinBars">true</item>
<item name="color">@android:color/white</item>
</style>
</resources>
src/main/res/values-v21/styles.xml
+2 -2
View File
@@ -24,6 +24,7 @@
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<item name="popup">@style/ThemeOverlay.AppCompat.Light</item>
<item name="toolbar_theme">@style/overflow_white1</item>
</style>
<style name="overflow_white1" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -45,7 +46,7 @@
<style name="overflow_white2" parent="Theme.AppCompat">
<item name="android:textColorSecondary">#ffffff</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimary">#ffffff</item>
<item name="android:actionModeBackground">@color/toolbar_cab</item>
</style>
@@ -53,5 +54,4 @@
<item name="spinBars">true</item>
<item name="color">@android:color/white</item>
</style>
</resources>
src/main/res/values/styles.xml
+5 -56
View File
@@ -16,84 +16,33 @@
<resources>
<style name="DarkTheme" parent="android:Theme.Holo">
<item name="android:actionOverflowButtonStyle">@style/OverflowActionModeDark</item>
<item name="android:actionModeBackground">@drawable/action_bar_dark</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_36dp</item>
</style>
<style name="TextAppearance" />
<style name="TextAppearance.Medium">
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.Small">
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
<item name="android:textColor">?android:attr/textColorTertiary</item>
</style>
<style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<item name="android:actionOverflowButtonStyle">@style/OverflowActionMode</item>
<item name="android:actionModeBackground">@drawable/action_bar</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_48dp</item>
<!--<item name="android:dropDownListViewStyle">@style/spinner_style</item>-->
</style>
<style name="OverflowActionModeDark" parent="@android:style/Widget.Holo.ActionButton.Overflow">
<item name="android:src">@drawable/ic_action_overflow</item>
</style>
<style name="OverflowActionMode" parent="@android:style/Widget.Holo.ActionButton.Overflow">
<item name="android:src">@drawable/ic_more_vert_black_48dp</item>
</style>
<style name="spinner_style" parent="android:style/Widget.ListView.DropDown">
<item name="android:divider">@android:color/transparent</item>
<item name="android:dividerHeight">@null</item>
</style>
<style name="secondary_text_appearance">
<item name="android:textSize">12sp</item>
<item name="android:textColor">#99000000</item>
<item name="android:textStyle">normal</item>
</style>
<!-- appCompat -->
<!-- light -->
<style name="appCompatLight" parent="Theme.AppCompat.Light.NoActionBar">
<style name="appCompatLight" parent="Theme.AppCompat.NoActionBar">
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeCopyDrawable">@drawable/ic_content_copy_black_36dp</item>
<item name="android:actionModeCutDrawable">@drawable/ic_content_cut_black_36dp</item>
<item name="android:actionModeSelectAllDrawable">@drawable/ic_select_all_black_36dp</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_48dp</item>
<item name="android:actionModePasteDrawable">@drawable/ic_content_paste_black_36dp</item>
<item name="windowActionModeOverlay">true</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<item name="popup">@style/ThemeOverlay.AppCompat.Light</item>
<item name="toolbar_theme">@style/overflow_white1</item>
<item name="ripple_color">@android:color/white</item>
<item name="android:actionModeBackground">@color/holo_dark_action_mode</item>
<item name="android:actionModeStyle">@style/customActionMdoe</item>
</style>
<style name="customActionMdoe" parent="Widget.AppCompat.ActionMode">
<item name="android:background">@color/holo_dark_action_mode</item>
</style>
<style name="overflow_white1" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<style name="overflow_white1" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:textColorSecondary">#ffffff</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimary">#ffffff</item>
<item name="android:actionModeBackground">@color/toolbar_cab</item>
</style>
<!-- dark -->
<style name="appCompatDark" parent="Theme.AppCompat.NoActionBar">
<item name="android:actionModeCopyDrawable">@drawable/ic_content_copy_black_36dp</item>
<item name="android:actionModeCutDrawable">@drawable/ic_content_cut_black_36dp</item>
<item name="android:actionModeSelectAllDrawable">@drawable/ic_select_all_black_36dp</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_48dp</item>
<item name="android:actionModePasteDrawable">@drawable/ic_content_paste_black_36dp</item>
<item name="windowActionModeOverlay">true</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<item name="popup">@style/Theme.AppCompat</item>
<item name="toolbar_theme">@style/overflow_white2</item>
<item name="ripple_color">@android:color/black</item>
</style>
<style name="overflow_white2" parent="Theme.AppCompat">
src/play/java/com/amaze/filemanager/activities/MainActivity.java
+9 -7
View File
@@ -214,11 +214,19 @@ public class MainActivity extends AppCompatActivity implements
e.printStackTrace();
}
Sp = PreferenceManager.getDefaultSharedPreferences(this);
int th = Integer.parseInt(Sp.getString("theme", "0"));
theme1 = th==2 ? PreferenceUtils.hourOfDay() : th;
if (theme1 == 1) {
setTheme(R.style.appCompatDark);
}
setContentView(R.layout.main_toolbar);
PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
tabHandler=new TabHandler(this,null,null,1);
Sp = PreferenceManager.getDefaultSharedPreferences(this);
buttonBarFrame = (FrameLayout) findViewById(R.id.buttonbarframe);
fabskin = Sp.getString("fab_skin_color", "#e91e63");
@@ -282,7 +290,6 @@ public class MainActivity extends AppCompatActivity implements
util = new IconUtils(Sp, this);
icons = new IconUtils(Sp, this);
int th = Integer.parseInt(Sp.getString("theme", "0"));
boolean v142 = Sp.getBoolean("v1.4.2", false);
if (!v142) {
try {
@@ -298,11 +305,6 @@ public class MainActivity extends AppCompatActivity implements
Sp.edit().putBoolean("v1.4.2", true).apply();
}
theme1 = th==2 ? PreferenceUtils.hourOfDay() : th;
if (theme1 == 1) {
setTheme(R.style.appCompatDark);
}
pathbar = (LinearLayout) findViewById(R.id.pathbar);
buttons = (LinearLayout) findViewById(R.id.buttons);
scroll = (HorizontalScrollView) findViewById(R.id.scroll);