Skip to content

I
InstiApp
Commit 09b3d7dd authored by Varun Patil's avatar Varun Patil
Browse files
Options

Fix colors in dark theme

parent 305b983b
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 28 deletions
app/src/main/res/layout/blog_post_card.xml
View file @ 09b3d7dd
......@@ -24,5 +24,5 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="?attr/themeColorInverse"
android:textColorLink="@color/colorPrimary" />
android:textColorLink="?attr/urlColor" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_about.xml
View file @ 09b3d7dd
......@@ -638,7 +638,7 @@
android:gravity="center"
android:linksClickable="true"
android:text="@string/django_api"
android:textColorLink="@color/colorPrimaryDark"
android:textColorLink="?attr/urlColor"
android:textStyle="bold" />
<TextView
......@@ -652,7 +652,7 @@
android:gravity="center"
android:linksClickable="true"
android:text="@string/android_app"
android:textColorLink="@color/colorPrimaryDark"
android:textColorLink="?attr/urlColor"
android:textStyle="bold" />
<TextView
......@@ -666,7 +666,7 @@
android:gravity="center"
android:linksClickable="true"
android:text="@string/angular_pwa"
android:textColorLink="@color/colorPrimaryDark"
android:textColorLink="?attr/urlColor"
android:textStyle="bold" />
......
app/src/main/res/layout/fragment_body.xml
View file @ 09b3d7dd
......@@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:layout_weight="10"
android:text="Org Title"
android:textColor="#fff"
android:textColor="@color/colorWhite"
android:textSize="21sp"
android:textStyle="bold" />
......@@ -137,8 +137,8 @@
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:textColor="#333"
android:textColorLink="@color/colorPrimary"
android:textColor="?attr/themeColorInverse"
android:textColorLink="?attr/urlColor"
android:textSize="16sp" />
<TextView
......
app/src/main/res/layout/fragment_event.xml
View file @ 09b3d7dd
......@@ -61,7 +61,7 @@
android:layout_height="wrap_content"
android:layout_weight="10"
android:text="Event Title"
android:textColor="?attr/themeColor"
android:textColor="@color/colorWhite"
android:textSize="21sp"
android:textStyle="bold" />
......@@ -73,7 +73,7 @@
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Event Website"
android:tint="?attr/themeColor"
android:tint="@color/colorWhite"
android:visibility="invisible"
app:srcCompat="@drawable/ic_language_black_24dp" />
......@@ -85,7 +85,7 @@
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Navigate"
android:tint="?attr/themeColor"
android:tint="@color/colorWhite"
app:srcCompat="@drawable/baseline_navigation_24" />
<ImageButton
......@@ -97,7 +97,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Share Event"
android:src="@drawable/ic_menu_share"
android:tint="?attr/themeColor" />
android:tint="@color/colorWhite" />
</LinearLayout>
<LinearLayout
......@@ -110,14 +110,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="No Date Specified"
android:textColor="?attr/themeColor"
android:textColor="@color/colorWhite"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" | "
android:textColor="?attr/themeColor"
android:textColor="@color/colorWhite"
android:textSize="20sp" />
<TextView
......@@ -125,14 +125,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="No Time Specified"
android:textColor="?attr/themeColor"
android:textColor="@color/colorWhite"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" | "
android:textColor="?attr/themeColor"
android:textColor="@color/colorWhite"
android:textSize="20sp" />
<TextView
......@@ -140,8 +140,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:text="No Venue Specified"
android:textColor="?attr/themeColor"
android:text="Venue"
android:textColor="@color/colorWhite"
android:textSize="16sp" />
</LinearLayout>
......@@ -190,6 +190,12 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#aaa">
</View>
<TextView
android:id="@+id/event_page_description"
android:layout_width="match_parent"
......@@ -199,7 +205,7 @@
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:textColor="?attr/themeColorInverse"
android:textColorLink="@color/colorPrimary"
android:textColorLink="?attr/urlColor"
android:textSize="16sp" />
<android.support.v7.widget.RecyclerView
......
app/src/main/res/layout/mess_menu_card.xml
View file @ 09b3d7dd
......@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Breakfast"
android:textColor="@color/colorPrimaryDark"
android:textColor="?attr/urlColor"
android:textSize="16sp" />
<TextView
......@@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Lunch"
android:textColor="@color/colorPrimaryDark"
android:textColor="?attr/urlColor"
android:textSize="16sp" />
<TextView
......@@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Tiffin"
android:textColor="@color/colorPrimaryDark"
android:textColor="?attr/urlColor"
android:textSize="16sp" />
<TextView
......@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Dinner"
android:textColor="@color/colorPrimaryDark"
android:textColor="?attr/urlColor"
android:textSize="16sp" />
<TextView
......
app/src/main/res/layout/news_article_card.xml
View file @ 09b3d7dd
......@@ -4,14 +4,14 @@
android:layout_height="wrap_content"
android:padding="16dp"
android:layout_margin="8dp"
android:background="#F2F2F2"
android:background="?attr/newsColor"
android:orientation="vertical">
<TextView
android:id="@+id/article_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#000000"
android:textColor="?attr/themeColorInverse"
android:textSize="20sp"
android:textStyle="bold" />
......@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:textColor="#000000"
android:textColor="?attr/themeColorInverse"
android:textSize="17sp" />
<TextView
......@@ -48,6 +48,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textColor="#000000"
android:textColorLink="@color/colorPrimary" />
android:textColor="?attr/themeColorInverse"
android:textColorLink="?attr/urlColor" />
</LinearLayout>
app/src/main/res/values/attrs.xml
View file @ 09b3d7dd
......@@ -39,5 +39,7 @@ limitations under the License.
<attr name="themeColor" format="reference|color" />
<attr name="themeColorInverse" format="reference|color" />
<attr name="newsColor" format="reference|color" />
<attr name="urlColor" format="reference|color" />
</resources>
\ No newline at end of file
app/src/main/res/values/styles.xml
View file @ 09b3d7dd
......@@ -8,6 +8,8 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="themeColor">#FFFFFF</item>
<item name="themeColorInverse">#000000</item>
<item name="newsColor">#F2F2F2</item>
<item name="urlColor">@color/colorPrimary</item>
</style>
<style name="AppTheme.NoActionBar">
......@@ -21,6 +23,8 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="themeColor">#000000</item>
<item name="themeColorInverse">#FFFFFF</item>
<item name="newsColor">#00000000</item>
<item name="urlColor">@color/colorAccent</item>
</style>
<style name="AppThemeDark.NoActionBar">
......@@ -29,7 +33,7 @@
</style>
<style name="BlueAccent">
<item name="colorAccent">@color/colorPrimary</item>
<item name="colorAccent">?attr/urlColor</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment