diff options
author | Marvin Borner | 2018-07-25 19:29:54 +0200 |
---|---|---|
committer | Marvin Borner | 2018-07-25 19:29:54 +0200 |
commit | 69ebd3e2ad575f01a88ef946cb10f2b64c6115b4 (patch) | |
tree | c9bad626df212d6e0f6b9000b5558f11215b32ff /app/src/main/res | |
parent | 1ae5b9e0c7aa95adf8d99ab7151888fc2b18c825 (diff) |
Modernized design
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 16 |
3 files changed, 24 insertions, 4 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2bd5037..0e2a766 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -23,6 +23,7 @@ android:background="?attr/colorPrimary" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay" + app:theme="@style/ActionBarThemeOverlay" app:title="@string/app_name"> </android.support.v7.widget.Toolbar> @@ -30,7 +31,10 @@ <android.support.design.widget.TabLayout android:id="@+id/tabs" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + app:tabMode="fixed" + app:tabSelectedTextColor="@color/tabSelectedTextColor" + app:tabTextColor="@color/tabTextColor"> <android.support.design.widget.TabItem android:id="@+id/tabItem" @@ -65,6 +69,6 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_margin" - app:srcCompat="@android:drawable/ic_dialog_email" /> + app:srcCompat="@android:drawable/ic_secure" /> </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 58e3556..6af5057 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="colorPrimary">#3F51B5</color> + <color name="colorPrimary">#fffafafa</color> <color name="colorPrimaryDark">#283593</color> <color name="colorAccent">#E91E63</color> + <color name="tabTextColor">#6c6c6c</color> + <color name="tabSelectedTextColor">#000</color> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 545b9c6..0153ca7 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,11 +1,15 @@ <resources> <!-- Base application theme. --> - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="AppTheme" parent="Theme.AppCompat.Light"> <!-- Customize your theme here. --> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> + <item name="tabTextColor">@color/tabTextColor</item> + <item name="android:colorControlNormal">@color/tabTextColor</item> + <item name="android:windowAnimationStyle">@style/AppTheme.WindowTransition</item> + <item name="android:toolbarStyle">@color/tabTextColor</item> </style> <style name="AppTheme.NoActionBar"> @@ -13,6 +17,16 @@ <item name="windowNoTitle">true</item> </style> + <style name="ActionBarThemeOverlay"> + <item name="android:textColorPrimary">@color/tabSelectedTextColor</item> + </style> + + <!-- Setting window animation --> + <style name="AppTheme.WindowTransition"> + <item name="android:windowEnterAnimation">@android:anim/fade_in</item> + <item name="android:windowExitAnimation">@android:anim/fade_out</item> + </style> + <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> |