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

Merge branch 'Gargron-master'

Browse source
This commit is contained in:
Vavassor 2017-03-07 22:35:02 -05:00
commit 7519ad5455
15 changed files with 130 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/res/layout/activity_splash.xml Normal file
View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:gravity="center"
android:orientation="vertical"
android:background="@color/color_background_dark"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
android:gravity="center"
android:layout_weight="1"
android:layout_height="0dp">
<com.mikhaellopez.circularfillableloaders.CircularFillableLoaders
android:id="@+id/circularFillableLoaders"
android:layout_width="200dp"
android:layout_height="200dp"
android:src="@mipmap/ic_logo"
app:cfl_border="true"
app:cfl_border_width="4dp"
app:cfl_progress="80"
app:cfl_wave_amplitude="0.08"
app:cfl_wave_color="@color/color_primary_dark" />
</LinearLayout>
</LinearLayout>

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

@ -231,6 +231,8 @@
android:layout_height="wrap_content"
android:layout_below="@id/status_media_preview_container"
android:layout_toRightOf="@+id/status_avatar"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingBottom="8dp"
android:paddingTop="6dp">
@ -246,10 +248,14 @@
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageButton
app:srcCompat="@drawable/ic_repeat_24dp"
<com.varunest.sparkbutton.SparkButton
android:id="@+id/status_reblog"
style="?attr/image_button_style"
app:sparkbutton_activeImage="@drawable/reblog_active"
app:sparkbutton_inActiveImage="@drawable/reblog_inactive"
app:sparkbutton_iconSize="28dp"
android:layout_gravity="center"
app:sparkbutton_primaryColor="@color/status_reblog_button_marked_dark"
app:sparkbutton_secondaryColor="@color/status_reblog_button_marked_light"
android:layout_width="32dp"
android:layout_height="32dp" />
@ -258,11 +264,15 @@
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageButton
<com.varunest.sparkbutton.SparkButton
android:layout_width="32dp"
android:layout_height="32dp"
style="?attr/image_button_style"
app:srcCompat="@drawable/ic_star_24dp"
app:sparkbutton_activeImage="@drawable/favourite_active"
app:sparkbutton_inActiveImage="@drawable/favourite_inactive"
app:sparkbutton_iconSize="28dp"
android:layout_gravity="center"
app:sparkbutton_primaryColor="@color/status_favourite_button_marked_light"
app:sparkbutton_secondaryColor="?attr/status_favourite_button_marked_tint"
android:id="@+id/status_favourite" />
<Space