the rest of changes forgot tu stage :-)

This commit is contained in:
massimiliano 2020-01-18 20:31:34 +01:00
parent 4dc27d6fb7
commit 5b52be3670
16 changed files with 86 additions and 116 deletions

View File

@ -14,8 +14,8 @@
<option name="values">
<map>
<entry key="assetSourceType" value="FILE" />
<entry key="outputName" value="ic_about" />
<entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/v2/ic_about.svg" />
<entry key="outputName" value="ic_settings" />
<entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/v2/ic_settings.svg" />
</map>
</option>
</PersistentState>

View File

@ -106,6 +106,35 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
FrameLayout frameLayoutContainer = findViewById(R.id.framelayout_container);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
toolbar.setNavigationIcon( R.drawable.ic_home );
toolbar.setNavigationOnClickListener( new View.OnClickListener() {
@Override
public void onClick(View v) {
ScrollView dashboard = findViewById(R.id.dashboard);
TranslateAnimation animateup = new TranslateAnimation(0,0,-2*dashboard.getHeight(),0);
TranslateAnimation animatedown = new TranslateAnimation(0,0,0,-dashboard.getHeight());
if(webView.getVisibility()==View.VISIBLE){
//animation
animateup.setDuration(500);
animateup.setFillAfter(false);
dashboard.startAnimation(animateup);
dashboard.setVisibility(View.VISIBLE);
webView.setVisibility(View.GONE);
return;
}
if (webView.getVisibility()==View.GONE && webView.getUrl()!=null){
//animation
animatedown.setDuration(500);
animatedown.setFillAfter(false);
dashboard.startAnimation(animatedown);
hideDashboard();
return;
}
else
return;
}
} );
setupWebView(savedInstanceState, frameLayoutContainer);
//settings
firstStart = getSharedPreferences("org.disroot.disrootap", MODE_PRIVATE);//fisrt start
@ -1412,7 +1441,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
case R.id.action_share:
shareCurrentPage();
return true;
case R.id.action_home:
/*case R.id.action_home:
if(webView.getVisibility()==View.VISIBLE){
//animation
animateup.setDuration(500);
@ -1432,7 +1461,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return true;
}
else
return true;
return true;*/
case R.id.action_forget:
showForget();

View File

@ -1,11 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="m14.8661,34.0446 l2.0893,-3.7768C13.8482,28.0179 12,24.4018 12,20.5714 12,18.4554 12.5625,16.3661 13.6339,14.5446 9.4554,16.6875 5.9732,20.0625 3.4286,24 6.2143,28.3125 10.1518,31.9286 14.8661,34.0446ZM25.2857,13.7143c0,-0.6964 -0.5893,-1.2857 -1.2857,-1.2857 -4.4732,0 -8.1429,3.6696 -8.1429,8.1429 0,0.6964 0.5893,1.2857 1.2857,1.2857 0.6964,0 1.2857,-0.5893 1.2857,-1.2857C18.4286,17.4911 20.9464,15 24,15c0.6964,0 1.2857,-0.5893 1.2857,-1.2857zM35.0089,8.5982c0,0.0536 0,0.1875 -0.0268,0.2411 -5.6518,10.0982 -11.25,20.25 -16.9018,30.3482l-1.3125,2.3839C16.6071,41.8393 16.3125,42 16.0179,42 15.5357,42 12.9911,40.4464 12.4286,40.125 12.1607,39.9643 12,39.6964 12,39.375 12,38.9464 12.9107,37.5 13.1786,37.0446 7.9821,34.6875 3.6161,30.6696 0.5357,25.8482 0.1875,25.3125 0,24.6696 0,24 0,23.3571 0.1875,22.6875 0.5357,22.1518 5.8393,14.0089 14.1161,8.5714 24,8.5714c1.6071,0 3.2411,0.1607 4.8214,0.4554L30.2679,6.4286C30.4286,6.1607 30.6964,6 31.0179,6c0.4821,0 3,1.5536 3.5625,1.875 0.2679,0.1607 0.4286,0.4286 0.4286,0.7232zM36,20.5714C36,25.5536 32.9196,30 28.2857,31.7679l7.5,-13.4464c0.1339,0.75 0.2143,1.5 0.2143,2.25zM48,24c0,0.6964 -0.1875,1.2589 -0.5357,1.8482 -0.8304,1.3661 -1.875,2.6786 -2.9196,3.8839C39.2946,35.7589 32.0625,39.4286 24,39.4286l1.9821,-3.5357C33.7768,35.2232 40.3929,30.4821 44.5714,24 42.5893,20.9196 40.0446,18.2143 37.0179,16.125l1.6875,-3c3.3214,2.2232 6.6696,5.5714 8.7589,9.0268C47.8125,22.7411 48,23.3036 48,24Z"
android:strokeWidth="0.02678571"
android:fillColor="#ffffff"
android:fillAlpha="1"/>
</vector>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true"
android:drawable="@drawable/ic_uncheck" />
<item android:state_checked="false"
android:drawable="@drawable/ic_check" />
</selector>

View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="32dp"
android:height="32dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

View File

@ -1,11 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:width="24dp"
android:height="24dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="m14.8661,34.0446 l2.0893,-3.7768C13.8482,28.0179 12,24.4018 12,20.5714 12,18.4554 12.5625,16.3661 13.6339,14.5446 9.4554,16.6875 5.9732,20.0625 3.4286,24 6.2143,28.3125 10.1518,31.9286 14.8661,34.0446ZM25.2857,13.7143c0,-0.6964 -0.5893,-1.2857 -1.2857,-1.2857 -4.4732,0 -8.1429,3.6696 -8.1429,8.1429 0,0.6964 0.5893,1.2857 1.2857,1.2857 0.6964,0 1.2857,-0.5893 1.2857,-1.2857C18.4286,17.4911 20.9464,15 24,15c0.6964,0 1.2857,-0.5893 1.2857,-1.2857zM35.0089,8.5982c0,0.0536 0,0.1875 -0.0268,0.2411 -5.6518,10.0982 -11.25,20.25 -16.9018,30.3482l-1.3125,2.3839C16.6071,41.8393 16.3125,42 16.0179,42 15.5357,42 12.9911,40.4464 12.4286,40.125 12.1607,39.9643 12,39.6964 12,39.375 12,38.9464 12.9107,37.5 13.1786,37.0446 7.9821,34.6875 3.6161,30.6696 0.5357,25.8482 0.1875,25.3125 0,24.6696 0,24 0,23.3571 0.1875,22.6875 0.5357,22.1518 5.8393,14.0089 14.1161,8.5714 24,8.5714c1.6071,0 3.2411,0.1607 4.8214,0.4554L30.2679,6.4286C30.4286,6.1607 30.6964,6 31.0179,6c0.4821,0 3,1.5536 3.5625,1.875 0.2679,0.1607 0.4286,0.4286 0.4286,0.7232zM36,20.5714C36,25.5536 32.9196,30 28.2857,31.7679l7.5,-13.4464c0.1339,0.75 0.2143,1.5 0.2143,2.25zM48,24c0,0.6964 -0.1875,1.2589 -0.5357,1.8482 -0.8304,1.3661 -1.875,2.6786 -2.9196,3.8839C39.2946,35.7589 32.0625,39.4286 24,39.4286l1.9821,-3.5357C33.7768,35.2232 40.3929,30.4821 44.5714,24 42.5893,20.9196 40.0446,18.2143 37.0179,16.125l1.6875,-3c3.3214,2.2232 6.6696,5.5714 8.7589,9.0268C47.8125,22.7411 48,23.3036 48,24Z"
android:strokeWidth="0.02678571"
android:fillColor="#ffffff"
android:fillColor="#808080"
android:fillAlpha="1"/>
</vector>

View File

@ -1,11 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="m10.6179,39.2541c0,-1.0238 -0.8483,-1.872 -1.872,-1.872 -1.0238,0 -1.872,0.8483 -1.872,1.872 0,1.0238 0.8483,1.872 1.872,1.872 1.0238,0 1.872,-0.8483 1.872,-1.872zM29.4552,26.9689 L9.5064,46.9177C8.8336,47.5905 7.8684,48 6.8739,48 5.8793,48 4.9141,47.5905 4.2121,46.9177L1.1115,43.7587C0.4095,43.0859 0,42.1207 0,41.1261 0,40.1316 0.4095,39.1664 1.1115,38.4644L21.0311,18.5448c1.521,3.8318 4.5923,6.9031 8.4241,8.4241zM48,14.245c0,0.9653 -0.351,2.1645 -0.6728,3.1005 -1.8428,5.2066 -6.8446,8.8044 -12.3729,8.8044 -7.2249,0 -13.1042,-5.8793 -13.1042,-13.1042 0,-7.2249 5.8793,-13.1042 13.1042,-13.1042 2.1353,0 4.9141,0.6435 6.6984,1.8428 0.2925,0.2048 0.468,0.468 0.468,0.819 0,0.3218 -0.2048,0.6435 -0.468,0.819l-8.5704,4.9433v6.5521l5.6453,3.1298c0.9653,-0.5558 7.7514,-4.8263 8.3364,-4.8263 0.585,0 0.936,0.4388 0.936,1.0238z"
android:strokeWidth="0.02925046"
android:fillColor="#ffffff"
android:fillAlpha="1"/>
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#808080"
android:pathData="m10.6179,39.2541c0,-1.0238 -0.8483,-1.872 -1.872,-1.872 -1.0238,0 -1.872,0.8483 -1.872,1.872 0,1.0238 0.8483,1.872 1.872,1.872 1.0238,0 1.872,-0.8483 1.872,-1.872zM29.4552,26.9689 L9.5064,46.9177C8.8336,47.5905 7.8684,48 6.8739,48 5.8793,48 4.9141,47.5905 4.2121,46.9177L1.1115,43.7587C0.4095,43.0859 0,42.1207 0,41.1261 0,40.1316 0.4095,39.1664 1.1115,38.4644L21.0311,18.5448c1.521,3.8318 4.5923,6.9031 8.4241,8.4241zM48,14.245c0,0.9653 -0.351,2.1645 -0.6728,3.1005 -1.8428,5.2066 -6.8446,8.8044 -12.3729,8.8044 -7.2249,0 -13.1042,-5.8793 -13.1042,-13.1042 0,-7.2249 5.8793,-13.1042 13.1042,-13.1042 2.1353,0 4.9141,0.6435 6.6984,1.8428 0.2925,0.2048 0.468,0.468 0.468,0.819 0,0.3218 -0.2048,0.6435 -0.468,0.819l-8.5704,4.9433v6.5521l5.6453,3.1298c0.9653,-0.5558 7.7514,-4.8263 8.3364,-4.8263 0.585,0 0.936,0.4388 0.936,1.0238z" android:strokeWidth="0.02925046"/>
</vector>

View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:width="24dp"
android:height="24dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path

View File

@ -16,16 +16,7 @@
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/DisTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/DisTheme.PopupOverlay"
app:title="@string/action_about">
</android.support.v7.widget.Toolbar>
<include layout="@layout/item_toolbar" />
<android.support.design.widget.TabLayout
android:id="@+id/tabs"

View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<include layout="@layout/item_toolbar" />
@ -13,7 +14,7 @@
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="10dp"
android:progressTint="@color/bg_primary_blue_dark"
android:progressTint="@color/dark_grey"
android:visibility="gone"
android:indeterminate="false"
android:max="100"

View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.SettingsActivity"
@ -10,25 +9,7 @@
android:background="@color/dark_grey"
android:id="@+id/iconSettings">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_primary_blue"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/DisTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
android:background="@color/bg_primary_blue"
app:layout_scrollFlags="scroll|enterAlways"
app:title="@string/settings">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<include layout="@layout/item_toolbar" />
<ScrollView
android:layout_width="match_parent"
@ -68,6 +49,7 @@
android:drawableLeft="@drawable/ic_mail" />
<CheckBox
android:id="@+id/mailBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -89,6 +71,7 @@
android:drawableLeft="@drawable/ic_cloud"/>
<CheckBox
android:id="@+id/cloudBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -109,6 +92,7 @@
android:drawableLeft="@drawable/ic_forum"/>
<CheckBox
android:id="@+id/foumBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -129,6 +113,7 @@
android:drawableLeft="@drawable/ic_chat"/>
<CheckBox
android:id="@+id/chatBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -148,6 +133,7 @@
android:drawableLeft="@drawable/ic_pad"/>
<CheckBox
android:id="@+id/padBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -167,6 +153,7 @@
android:drawableLeft="@drawable/ic_calc"/>
<CheckBox
android:id="@+id/calcBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -186,6 +173,7 @@
android:drawableLeft="@drawable/ic_bin"/>
<CheckBox
android:id="@+id/binBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -205,6 +193,7 @@
android:drawableLeft="@drawable/ic_upload"/>
<CheckBox
android:id="@+id/uploadBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -224,6 +213,7 @@
android:drawableLeft="@drawable/ic_searx"/>
<CheckBox
android:id="@+id/searxBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -243,6 +233,7 @@
android:drawableLeft="@drawable/ic_poll"/>
<CheckBox
android:id="@+id/pollsBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -262,6 +253,7 @@
android:drawableLeft="@drawable/ic_board"/>
<CheckBox
android:id="@+id/boardBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -281,6 +273,7 @@
android:drawableLeft="@drawable/ic_calls"/>
<CheckBox
android:id="@+id/callsBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -300,6 +293,7 @@
android:drawableLeft="@drawable/ic_notes"/>
<CheckBox
android:id="@+id/notesBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -319,6 +313,7 @@
android:drawableLeft="@drawable/ic_git"/>
<CheckBox
android:id="@+id/gitBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -338,6 +333,7 @@
android:drawableLeft="@drawable/ic_user"/>
<CheckBox
android:id="@+id/userBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -357,6 +353,7 @@
android:drawableLeft="@drawable/ic_howto"/>
<CheckBox
android:id="@+id/howToBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
@ -376,6 +373,7 @@
android:drawableLeft="@drawable/ic_about"/>
<CheckBox
android:id="@+id/aboutBtnPreference"
android:button="@drawable/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>

View File

@ -7,25 +7,8 @@
android:orientation="vertical"
tools:context=".ui.StateActivity">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/DisTheme.AppBarOverlay">
<include layout="@layout/item_toolbar" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/DisTheme.PopupOverlay"
app:title="@string/app_state">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@ -7,25 +7,8 @@
android:orientation="vertical"
tools:context=".ui.StateActivity">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/DisTheme.AppBarOverlay">
<include layout="@layout/item_toolbar" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/DisTheme.PopupOverlay"
app:title="@string/app_state">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@ -2,13 +2,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.disroot.disrootapp.ui.AboutActivity">
<!--
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never" />
-->
<item
android:icon="@drawable/ic_home"
android:id="@+id/action_home"

View File

@ -3,11 +3,11 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MainActivity">
<item
<!--<item
android:id="@+id/action_home"
android:icon="@drawable/ic_home"
android:title="@string/action_home"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom"/>-->
<item
android:id="@+id/action_share"
android:orderInCategory="1"
@ -36,7 +36,7 @@
android:id="@+id/action_optimization"
android:title="@string/action_optimization" />
<item
android:icon="@drawable/ic_reload"
android:icon="@drawable/ic_settings"
android:id="@+id/action_set_icons"
android:title="@string/settings" />
<item

View File

@ -165,7 +165,7 @@
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="settings">Impostazioni</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>

View File

@ -11,8 +11,8 @@
<item name="toolbarStyle">@style/Widget.MyApp.ActionBar</item>
<item name="android:textAllCaps">false</item>
<!--i<item name="cardViewStyle">@style/CardView</item>-->
<item name="colorControlNormal">@color/gray</item><!--if checkbox is activated-->
<item name="colorControlActivated">@color/gray</item><!--if checkbox is activated-->
<!--<item name="colorControlNormal">@color/gray</item>if checkbox is activated-->
<!--<item name="colorControlActivated">@color/gray</item>if checkbox is activated-->
</style>
<style name="DisTheme.Settings" parent="Theme.AppCompat.Light.NoActionBar">
@ -22,13 +22,14 @@
<item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
</style>
<style name="Widget.MyApp.ActionBar" parent="Widget.AppCompat.ActionBar">
<item name="theme">@style/ThemeOverlay.MyApp.ActionBar</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item> <!--change theme for actionbar poupmenu-->
</style>
<style name="ThemeOverlay.MyApp.ActionBar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:textColor">@color/gray</item>
<item name="android:textColor">@color/white</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:actionMenuTextColor">@color/gray</item><!--<item name="android:textSize">18sp</item>-->
</style>