Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '52-appcompat-action-bar' into 'master'

Browse Source 
Added AppCompatActivity

Closes #52 

See merge request !14
This commit is contained in:
akwizgran
2015-12-15 11:34:03 +00:00
parent d0ac34e894 cdf8392725
commit 4dd9e25079
9 changed files with 169 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/res/values/color.xml
View File

@@ -15,5 +15,12 @@
<color name="settings_title_text">#2D3E50</color>
<color name="settings_title_underline">#2D3E50</color>
<color name="text_link">#2D3E50</color>
<color name="briar_primary">#2D3E50</color>
<color name="briar_primary_dark">#0f1720</color>
<color name="briar_text_link">#2D3E50</color>
<color name="briar_green_light">#95d220</color>
<color name="briar_green_dark">#75ab0d</color>
<color name="briar_text_primary">#333333</color>
<color name="briar_text_primary_inverse">#ffffff</color>
</resources>

24
briar-android/res/values/styles.xml
View File

@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="LightTheme" parent="android:Theme.Light">
<item name="android:windowTitleStyle">@style/WindowTitle</item>
<item name="android:windowTitleBackgroundStyle">@style/WindowTitleBackground</item>
<item name="android:windowBackground">@color/window_background</item>
<style name="BriarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="actionBarStyle">@style/BriarActionBar</item>
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
<item name="android:textColorPrimary">@color/briar_text_primary</item>
<item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item>
<item name="android:textColorSecondary">@color/briar_text_primary</item>
<item name="android:textColorLink">@color/briar_text_link</item>
<!-- The rest of your attributes -->
</style>
<style name="WindowTitle">
<item name="android:paddingLeft">5dp</item>
<item name="android:textColor">@color/action_bar_text</item>
</style>
<style name="WindowTitleBackground">
<item name="android:background">@color/action_bar_background</item>
<style name="BriarActionBar" parent="Base.Widget.AppCompat.Light.ActionBar.Solid">
<item name="elevation">1dp</item>
</style>
<style name="BriarButton">