chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Changed visual theme to a dark style. Also, set up things for a future switchable light/dark theme.

Browse source
This commit is contained in:
Vavassor 2017-02-13 00:18:17 -05:00
commit 22a2a31afe
44 changed files with 377 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/res/layout/activity_account.xml
View file

@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="?attr/actionBarSize"
android:background="@color/account_header_background">
android:background="?attr/account_header_background_color">
<com.android.volley.toolbox.NetworkImageView
android:layout_width="match_parent"
@ -79,8 +79,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:background="@color/colorPrimary"
android:layout_gravity="top"
app:layout_collapseMode="pin" />

4
app/src/main/res/layout/activity_compose.xml
View file

@ -15,7 +15,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
app:srcCompat="@drawable/media_selector"
style="?android:attr/borderlessButtonStyle"
style="?attr/image_button_style"
android:id="@+id/compose_photo_pick"
android:layout_marginLeft="8dp" />
@ -24,7 +24,7 @@
android:layout_height="48dp"
android:id="@+id/compose_options"
app:srcCompat="@drawable/ic_options"
style="?android:attr/borderlessButtonStyle"
style="?attr/image_button_style"
android:layout_marginLeft="8dp" />
</LinearLayout>

7
app/src/main/res/layout/activity_login.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -11,10 +10,8 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
android:background="@color/colorPrimary"
android:elevation="4dp" />
<RelativeLayout
android:layout_width="match_parent"

6
app/src/main/res/layout/activity_main.xml
View file

@ -20,10 +20,8 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
android:background="@color/colorPrimary"
android:elevation="4dp" />
<android.support.v4.view.ViewPager
android:id="@+id/pager"

7
app/src/main/res/layout/activity_view_tag.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_view_thread"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -16,10 +15,8 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
android:background="@color/colorPrimary"
android:elevation="4dp" />
<FrameLayout
android:id="@+id/fragment_container"

6
app/src/main/res/layout/activity_view_thread.xml
View file

@ -16,10 +16,8 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
android:background="@color/colorPrimary"
android:elevation="4dp" />
<FrameLayout
android:id="@+id/fragment_container"

28
app/src/main/res/layout/item_follow.xml
View file

@ -4,28 +4,22 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="@dimen/status_avatar_column_width"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/notification_side_column">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_followed"
android:paddingTop="@dimen/notification_icon_vertical_padding"
android:paddingBottom="@dimen/notification_icon_vertical_padding"
android:paddingRight="@dimen/status_avatar_padding"
android:layout_alignParentRight="true" />
</RelativeLayout>
android:id="@+id/follow_icon"
app:srcCompat="@drawable/ic_followed"
android:paddingTop="@dimen/notification_icon_vertical_padding"
android:paddingBottom="@dimen/notification_icon_vertical_padding"
android:paddingRight="@dimen/status_avatar_padding"
android:paddingLeft="@dimen/follow_icon_left_padding"
android:tint="?attr/notification_icon_tint" />
<TextView
android:layout_toRightOf="@id/notification_side_column"
android:id="@+id/notification_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/notification_icon_vertical_padding"
android:layout_alignParentBottom="true" />
android:layout_centerVertical="true"
android:layout_toRightOf="@id/follow_icon" />
</RelativeLayout>

82
app/src/main/res/layout/item_status.xml
View file

@ -5,38 +5,37 @@
android:layout_height="wrap_content"
android:id="@+id/status_container">
<TextView
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/status_boosted"
android:id="@+id/status_reblogged_bar"
android:layout_alignParentTop="true"
android:layout_toRightOf="@+id/status_boosted_icon"
android:layout_toEndOf="@+id/status_boosted_icon"
android:visibility="gone" />
android:layout_alignParentLeft="true"
android:layout_marginTop="@dimen/status_reblogged_bar_top_padding">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_reblogged"
android:id="@+id/status_boosted_icon"
android:adjustViewBounds="false"
android:cropToPadding="false"
android:layout_alignRight="@+id/status_avatar"
android:visibility="gone"
android:paddingRight="@dimen/status_avatar_padding"
android:paddingTop="@dimen/status_boost_icon_vertical_padding"
android:paddingBottom="@dimen/status_boost_icon_vertical_padding"
android:layout_alignParentTop="true" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_reblogged"
android:id="@+id/status_reblogged_icon"
android:paddingRight="@dimen/status_avatar_padding"
android:paddingLeft="@dimen/status_reblogged_icon_left_padding" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/status_reblogged"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/status_reblogged_icon" />
</RelativeLayout>
<com.android.volley.toolbox.NetworkImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="64dp"
android:layout_height="64dp"
android:scaleType="fitCenter"
android:id="@+id/status_avatar"
android:layout_alignParentRight="false"
android:layout_alignParentTop="false"
android:layout_alignParentLeft="false"
android:layout_alignParentStart="false"
android:layout_below="@+id/status_boosted"
android:layout_below="@+id/status_reblogged_bar"
android:padding="@dimen/status_avatar_padding" />
<com.keylesspalace.tusky.FlowLayout
@ -44,8 +43,9 @@
android:layout_toRightOf="@+id/status_avatar"
android:layout_toEndOf="@+id/status_avatar"
android:id="@+id/status_name_bar"
android:layout_below="@+id/status_boosted_icon"
android:layout_width="wrap_content">
android:layout_below="@+id/status_reblogged_bar"
android:layout_width="wrap_content"
android:paddingTop="@dimen/status_avatar_padding">
<TextView
android:id="@+id/status_display_name"
@ -58,13 +58,15 @@
android:id="@+id/status_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/status_username_left_margin" />
android:paddingLeft="@dimen/status_username_left_margin"
android:textColor="?attr/status_text_color_secondary" />
<TextView
android:id="@+id/status_since_created"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/status_since_created_left_margin" />
android:paddingLeft="@dimen/status_since_created_left_margin"
android:textColor="?attr/status_text_color_secondary" />
</com.keylesspalace.tusky.FlowLayout>
@ -92,7 +94,7 @@
android:id="@+id/status_content_warning_button"
android:textOn="@string/status_content_warning_show_less"
android:textOff="@string/status_content_warning_show_more"
android:background="@drawable/toggle_small"
android:background="?attr/content_warning_button"
android:padding="4dp" />
</com.keylesspalace.tusky.FlowLayout>
@ -196,7 +198,7 @@
<ImageButton
app:srcCompat="@drawable/ic_reply"
android:id="@+id/status_reply"
style="?android:attr/borderlessButtonStyle"
style="?attr/image_button_style"
android:layout_width="32dp"
android:layout_height="32dp" />
@ -205,10 +207,10 @@
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageButton
app:srcCompat="@drawable/ic_reblog_off"
<com.keylesspalace.tusky.StatusButton
app:srcCompat="@drawable/ic_reblog"
android:id="@+id/status_reblog"
style="?android:attr/borderlessButtonStyle"
style="?attr/reblog_button_style"
android:layout_width="32dp"
android:layout_height="32dp" />
@ -217,12 +219,12 @@
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageButton
<com.keylesspalace.tusky.StatusButton
android:layout_width="32dp"
android:layout_height="32dp"
app:srcCompat="@drawable/ic_favourite_off"
android:id="@+id/status_favourite"
style="?android:attr/borderlessButtonStyle" />
style="?attr/favourite_button_style"
app:srcCompat="@drawable/ic_favourite"
android:id="@+id/status_favourite" />
<Space
android:layout_width="0dp"
@ -232,7 +234,7 @@
<ImageButton
app:srcCompat="@drawable/ic_extra"
android:id="@+id/status_more"
style="?android:attr/borderlessButtonStyle"
style="?attr/image_button_style"
android:layout_width="32dp"
android:layout_height="32dp" />

32
app/src/main/res/layout/item_status_notification.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="@dimen/status_avatar_column_width"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/notification_side_column">
android:id="@+id/notification_top_bar">
<ImageView
android:layout_width="wrap_content"
@ -15,25 +15,25 @@
android:id="@+id/notification_icon"
android:paddingTop="@dimen/notification_icon_vertical_padding"
android:paddingBottom="@dimen/notification_icon_vertical_padding"
android:paddingLeft="@dimen/notification_icon_left_padding"
android:paddingRight="@dimen/status_avatar_padding"
android:layout_alignParentRight="true" />
android:tint="?attr/notification_icon_tint" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/notification_text"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/notification_icon" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/notification_text"
android:layout_toRightOf="@id/notification_side_column"
android:paddingBottom="@dimen/notification_icon_vertical_padding" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/notification_content"
android:layout_toRightOf="@id/notification_side_column"
android:layout_below="@id/notification_text"
android:textColor="@color/notification_content_faded"
android:paddingLeft="@dimen/notification_avatar_column_width"
android:textColor="?attr/notification_content"
android:paddingBottom="8dp" />
</RelativeLayout>
</LinearLayout>

15
app/src/main/res/layout/tab_main.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/title"
android:layout_centerInParent="true"
android:textAllCaps="true"
android:textStyle="normal|bold"
android:textSize="12sp" />
</RelativeLayout>