Theme and Icons #260

Merged
mmarif merged 15 commits from light-theme into master 2020-03-08 13:52:34 +00:00
7 changed files with 26 additions and 9 deletions
Showing only changes of commit 50671907ba - Show all commits

View File

@ -5,7 +5,6 @@ import android.graphics.PorterDuff;
import android.graphics.drawable.GradientDrawable;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;

View File

@ -4,7 +4,7 @@
android:shape="rectangle">
<solid
android:color="@color/inputBackground">
android:color="?attr/inputBackgroundColor">
</solid>
<corners

View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<shape>
<solid
android:color="@color/inputBackground">
android:color="?attr/inputBackgroundColor">
</solid>
<corners

View File

@ -91,7 +91,7 @@
tools:ignore="Autofill"
android:labelFor="@+id/newRepoName"
android:background="@drawable/shape_inputs"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:inputType="textCapSentences|text"
android:textColorHighlight="?attr/primaryTextColor"/>
@ -118,7 +118,7 @@
android:scrollbars="vertical"
android:gravity="top|start"
android:textSize="14sp"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:inputType="textCapSentences|textMultiLine"
android:textColorHighlight="?attr/primaryTextColor"/>
@ -139,7 +139,7 @@
android:checked="true"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:theme="@style/checkBoxTheme"
android:textColor="?attr/primaryTextColor"/>
<Button

View File

@ -2,4 +2,6 @@
<resources>
<attr name="primaryTextColor" format="reference"/>
<attr name="primaryBackgroundColor" format="reference" />
<attr name="inputBackgroundColor" format="reference" />
<attr name="inputTextColor" format="reference" />
</resources>

View File

@ -31,5 +31,7 @@
<color name="lightThemeTextColor">#646565</color>
<color name="lightThemeBackground">#f9f9f9</color>
<color name="lightThemeInputBackground">#b6bbbf</color>
<color name="lightThemeInputTextColor">#212121</color>
</resources>

View File

@ -6,8 +6,11 @@
<item name="android:windowBackground">@color/colorPrimary</item>
<item name="android:typeface">monospace</item>
<item name="primaryTextColor">@color/white</item>
<item name="primaryTextColor">@color/colorWhite</item>
<item name="primaryBackgroundColor">@color/colorPrimary</item>
<item name="inputBackgroundColor">@color/inputBackground</item>
<item name="inputTextColor">@color/colorWhite</item>
<item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
</style>
<style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@ -17,6 +20,18 @@
<item name="primaryTextColor">@color/lightThemeTextColor</item>
<item name="primaryBackgroundColor">@color/lightThemeBackground</item>
<item name="inputBackgroundColor">@color/lightThemeInputBackground</item>
<item name="inputTextColor">@color/lightThemeInputTextColor</item>
<item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
</style>
<style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">
<item name="buttonTint">@color/colorDarkGreen</item>
</style>
<style name="AppThemeCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">
<item name="buttonTint">@color/colorWhite</item>
</style>
</resources>