Add theme dependencies

This commit is contained in:
neslihanturan 2017-12-26 13:19:38 +03:00 committed by maskara
parent b0a54ca89d
commit 5c3c4499dc
10 changed files with 39 additions and 13 deletions

View file

@ -374,7 +374,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
fabCommons.setOnClickListener(new View.OnClickListener() { fabCommons.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Log.d("deneme","deneme");
openWebView(place.siteLinks.getCommonsLink()); } openWebView(place.siteLinks.getCommonsLink()); }
}); });

View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:state_enabled="false" android:state_enabled="false"
android:color="@color/disabled_button_text_color_light" /> android:color="@color/opak_middle_grey" />
<item <item
android:color="@color/status_bar_blue" /> android:color="@color/status_bar_blue" />
</selector> </selector>

View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:state_enabled="false" android:state_enabled="false"
android:color="@color/disabled_button_text_color_light" /> android:color="?attr/textDisabled" />
<item <item
android:color="@color/enabled_button_text_color_light" /> android:color="?attr/textEnabled" />
</selector> </selector>

View file

@ -2,10 +2,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:state_pressed="true" android:state_pressed="true"
android:drawable="@color/pressed_button_background_light" /> android:drawable="@color/pressed_button_light" />
<item <item
android:state_focused="true" android:state_focused="true"
android:drawable="@color/focused_button_background_light" /> android:drawable="@color/focused_button_light"
<item />
android:drawable="@android:color/transparent" /> <item android:drawable="@android:color/transparent" />
</selector> </selector>

View file

@ -5,7 +5,7 @@
android:id="@+id/more_info_button" android:id="@+id/more_info_button"
android:visibility="gone" android:visibility="gone"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/default_circle_indicator_stroke_color" android:background="?attr/bottomBar"
> >
</LinearLayout> </LinearLayout>

View file

@ -4,7 +4,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/cardview_light_background" android:background="?attr/mainBackground"
app:layout_behavior="@string/bottom_sheet_behavior" app:layout_behavior="@string/bottom_sheet_behavior"
app:behavior_peekHeight="128dp" app:behavior_peekHeight="128dp"
app:behavior_hideable="true" app:behavior_hideable="true"

View file

@ -5,7 +5,7 @@
android:id="@+id/bottom_sheet" android:id="@+id/bottom_sheet"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/cardview_light_background" android:background="?attr/mainBackground"
app:layout_behavior="@string/bottom_sheet_behavior" app:layout_behavior="@string/bottom_sheet_behavior"
app:behavior_peekHeight="0dp" app:behavior_peekHeight="0dp"
app:behavior_hideable="true" app:behavior_hideable="true"

View file

@ -8,6 +8,13 @@
<attr name="uploadOverlayBackground" format="reference"/> <attr name="uploadOverlayBackground" format="reference"/>
<attr name="spinnerTheme" format="reference"/> <attr name="spinnerTheme" format="reference"/>
<attr name="iconsTheme" format="reference"/> <attr name="iconsTheme" format="reference"/>
<attr name="bottomBar" format="reference"/>
<attr name="buttonBackgroundFocused" format="reference"/>
<attr name="buttonBackgroundPressed" format="reference"/>
<attr name="buttonFocused" format="reference"/>
<attr name="buttonPressed" format="reference"/>
<attr name="textDisabled" format="reference"/>
<attr name="textEnabled" format="reference"/>
<declare-styleable name="CompatTextView"> <declare-styleable name="CompatTextView">
<attr name="drawablePadding" format="dimension"/> <attr name="drawablePadding" format="dimension"/>

View file

@ -31,10 +31,20 @@
<color name="upload_overlay_background_dark">#77000000</color> <color name="upload_overlay_background_dark">#77000000</color>
<color name="upload_overlay_background_light">#44000000</color> <color name="upload_overlay_background_light">#44000000</color>
<color name="pressed_button_background_light">#64999999</color> <color name="pressed_button_light">#64999999</color>
<color name="focused_button_background_light">#32999999</color> <color name="focused_button_light">#32999999</color>
<color name="disabled_button_text_color_light">#48000000</color> <color name="disabled_button_text_color_light">#48000000</color>
<color name="enabled_button_text_color_light">#B0000000</color> <color name="enabled_button_text_color_light">#B0000000</color>
<color name="pressed_button_dark">#40CCCCCC</color>
<color name="focused_button_dark">#26CCCCCC</color>
<color name="disabled_button_text_color_dark">#717171</color>
<color name="enabled_button_text_color_dark">#FFFFFF</color>
<color name="button_blue">#0c609c</color> <color name="button_blue">#0c609c</color>
<color name="bottom_bar_light">#E0E0E0</color>
<color name="bottom_bar_dark">#424242</color>
<color name="opak_middle_grey">#757575</color>
</resources> </resources>

View file

@ -14,6 +14,11 @@
<item name="uploadOverlayBackground">@color/upload_overlay_background_dark</item> <item name="uploadOverlayBackground">@color/upload_overlay_background_dark</item>
<item name="spinnerTheme">@style/DarkSpinnerTheme</item> <item name="spinnerTheme">@style/DarkSpinnerTheme</item>
<item name="iconsTheme">@color/main_background_light</item> <item name="iconsTheme">@color/main_background_light</item>
<item name="bottomBar">@color/bottom_bar_dark</item>
<item name="buttonBackgroundFocused">@color/focused_button_dark</item>
<item name="buttonBackgroundPressed">@color/pressed_button_dark</item>
<item name="textDisabled">@color/disabled_button_text_color_dark</item>
<item name="textEnabled">@color/enabled_button_text_color_dark</item>
</style> </style>
<style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
@ -29,6 +34,11 @@
<item name="uploadOverlayBackground">@color/upload_overlay_background_light</item> <item name="uploadOverlayBackground">@color/upload_overlay_background_light</item>
<item name="spinnerTheme">@style/LightSpinnerTheme</item> <item name="spinnerTheme">@style/LightSpinnerTheme</item>
<item name="iconsTheme">@color/main_background_dark</item> <item name="iconsTheme">@color/main_background_dark</item>
<item name="bottomBar">@color/bottom_bar_light</item>
<item name="buttonBackgroundFocused">@color/focused_button_light</item>
<item name="buttonBackgroundPressed">@color/pressed_button_light</item>
<item name="textDisabled">@color/disabled_button_text_color_light</item>
<item name="textEnabled">@color/enabled_button_text_color_light</item>
</style> </style>
<style name="DarkSpinnerTheme" parent="DarkAppTheme"> <style name="DarkSpinnerTheme" parent="DarkAppTheme">