Skip to content

Commit

Permalink
Issue #70: more styling
Browse files Browse the repository at this point in the history
  • Loading branch information
swentel committed Sep 5, 2018
1 parent ebc41b7 commit f08adce
Show file tree
Hide file tree
Showing 75 changed files with 161 additions and 54 deletions.
9 changes: 5 additions & 4 deletions app/src/main/assets/changelog
@@ -1,12 +1,13 @@
Current version: 0.11
<br /><br />
<a href="https://indigenous.abode.pub/android/privacy/">Privacy policy</a>
Current version: 0.11 - <a href="https://indigenous.abode.pub/android/privacy/">Privacy policy</a>
<br /><br />
Development happens on <a href="https://github.com/swentel/indigenous–android">GitHub</a>
<br /><br />
Icons from <a href="https://material.io/tools/icons/">Material Design</a>
<h2>Changelog</h2>
<h3>01/09/2018 - 0.11</h3>
<h3>05/09/2018 - 0.11</h3>
<ul>
<li>Public release</li>
<li>More lighter styling and cleaner icons</li>
<li>Add counter on all bodies</li>
<li>Use custom tabs for external link</li>
</ul>
Expand Down
Expand Up @@ -163,7 +163,7 @@ public void checkRefreshingStatus() {
* Opens the bottom sheet.
*/
public void openBottomSheet() {
new BottomSheet.Builder(this)
new BottomSheet.Builder(this, R.style.BottomSheet_StyleDialog)
.setSheet(R.menu.micropub_post_menu)
.setListener(this)
.show();
Expand Down
Binary file removed app/src/main/res/drawable/article.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/audio.png
Binary file not shown.
Binary file modified app/src/main/res/drawable/avatar_small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable/bookmark.png
Binary file not shown.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_article.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_article_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_article_idle" />
<item android:drawable="@drawable/button_article_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_article_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_article_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_audio.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_audio_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_audio_idle" />
<item android:drawable="@drawable/button_audio_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_audio_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_audio_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_bookmark.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_bookmark_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_bookmark_idle" />
<item android:drawable="@drawable/button_bookmark_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_bookmark_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_close.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_close_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_close_idle" />
<item android:drawable="@drawable/button_close_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_close_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_close_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_event.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_event_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_event_idle" />
<item android:drawable="@drawable/button_event_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_event_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_event_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_external.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_external_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_external_idle" />
<item android:drawable="@drawable/button_external_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_external_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_like.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_like_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_like_idle" />
<item android:drawable="@drawable/button_like_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_like_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_like_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_note.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_note_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_note_idle" />
<item android:drawable="@drawable/button_note_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_note_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_note_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_reply.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_reply_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_reply_idle" />
<item android:drawable="@drawable/button_reply_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_reply_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_reply_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_repost.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_repost_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_repost_idle" />
<item android:drawable="@drawable/button_repost_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_repost_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_repost_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/button_rsvp.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/button_rsvp_pressed" />
<item android:state_focused="true"
android:drawable="@drawable/button_rsvp_idle" />
<item android:drawable="@drawable/button_rsvp_idle" />
</selector>
Binary file added app/src/main/res/drawable/button_rsvp_idle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/button_rsvp_pressed.png
Binary file removed app/src/main/res/drawable/close.png
Diff not rendered.
Binary file removed app/src/main/res/drawable/event.png
Diff not rendered.
Binary file removed app/src/main/res/drawable/external.png
Diff not rendered.
Binary file added app/src/main/res/drawable/ic_reply_black_48dp.png
Binary file added app/src/main/res/drawable/ic_send_white_48dp.png
Binary file removed app/src/main/res/drawable/like.png
Diff not rendered.
Binary file removed app/src/main/res/drawable/note.png
Diff not rendered.
Binary file removed app/src/main/res/drawable/reply.png
Diff not rendered.
Binary file removed app/src/main/res/drawable/repost.png
Diff not rendered.
Binary file removed app/src/main/res/drawable/rsvp.png
Diff not rendered.
7 changes: 4 additions & 3 deletions app/src/main/res/layout/activity_timeline_audio.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:padding="10dp"
android:padding="@dimen/timeline_list_item_padding"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
Expand All @@ -10,7 +10,6 @@
android:id="@+id/timeline_audio_author_photo"
android:layout_height="50dp"
android:padding="5dp"
android:scaleType="centerCrop"
android:contentDescription="@string/author_photo"
android:layout_width="50dp" />

Expand All @@ -21,15 +20,17 @@

<TextView
android:id="@+id/timeline_audio_author"
android:textColor="@color/textColor"
android:layout_height="wrap_content"
android:padding="5dp"
android:textSize="14sp"
android:textSize="@dimen/timeline_list_item_author_size"
android:layout_width="fill_parent" />

<TextView
android:layout_marginBottom="20dp"
android:textSize="18sp"
android:padding="5dp"
android:textColor="@color/textColor"
android:id="@+id/timeline_audio_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_timeline_image.xml
Expand Up @@ -20,7 +20,7 @@
android:layout_marginTop="15dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:background="@drawable/close"
android:background="@drawable/button_close"
android:layout_alignParentEnd="true"
android:layout_marginEnd="15dp" />

Expand Down
53 changes: 23 additions & 30 deletions app/src/main/res/layout/timeline_list_item.xml
Expand Up @@ -9,7 +9,7 @@
<ImageView
android:id="@+id/timeline_author_photo"
android:layout_height="50dp"
android:scaleType="centerCrop"
android:src="@drawable/avatar_small"
android:contentDescription="@string/author_photo"
android:layout_width="50dp" />

Expand Down Expand Up @@ -104,70 +104,63 @@
android:layout_width="fill_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<Button
android:layout_marginTop="5dp"
android:background="@drawable/reply"
android:background="@drawable/button_reply"
android:id="@+id/itemReply"
android:layout_width="25dp"
android:layout_height="19dp" />
android:layout_width="@dimen/timeline_list_item_icon_size"
android:layout_height="@dimen/timeline_list_item_icon_size" />

<Button
android:layout_marginLeft="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginStart="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginTop="5dp"
android:background="@drawable/like"
android:background="@drawable/button_like"
android:id="@+id/itemLike"
android:layout_width="19dp"
android:layout_height="19dp" />
android:layout_width="@dimen/timeline_list_item_icon_size"
android:layout_height="@dimen/timeline_list_item_icon_size" />

<Button
android:layout_marginLeft="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginStart="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginTop="5dp"
android:background="@drawable/repost"
android:background="@drawable/button_repost"
android:id="@+id/itemRepost"
android:layout_width="24dp"
android:layout_height="19dp" />
android:layout_width="@dimen/timeline_list_item_icon_size"
android:layout_height="@dimen/timeline_list_item_icon_size" />

<Button
android:layout_marginLeft="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginStart="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginTop="5dp"
android:background="@drawable/bookmark"
android:background="@drawable/button_bookmark"
android:id="@+id/itemBookmark"
android:layout_width="19dp"
android:layout_height="19dp" />
android:layout_width="@dimen/timeline_list_item_icon_size"
android:layout_height="@dimen/timeline_list_item_icon_size" />

<Button
android:layout_marginLeft="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginStart="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginTop="5dp"
android:background="@drawable/external"
android:background="@drawable/button_external"
android:id="@+id/itemExternal"
android:layout_width="19dp"
android:layout_height="19dp" />
android:layout_width="@dimen/timeline_list_item_icon_size"
android:layout_height="@dimen/timeline_list_item_icon_size" />

<Button
android:layout_marginLeft="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginStart="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginTop="5dp"
android:background="@drawable/audio"
android:background="@drawable/button_audio"
android:id="@+id/itemAudio"
android:layout_width="22dp"
android:layout_height="19dp" />
android:layout_width="@dimen/timeline_list_item_icon_size"
android:layout_height="@dimen/timeline_list_item_icon_size" />

<Button
android:layout_marginLeft="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginStart="@dimen/timeline_list_item_icon_margin_left"
android:layout_marginTop="5dp"
android:background="@drawable/rsvp"
android:background="@drawable/button_rsvp"
android:id="@+id/itemRSVP"
android:layout_width="21dp"
android:layout_height="19dp" />
android:layout_width="@dimen/timeline_list_item_icon_size"
android:layout_height="@dimen/timeline_list_item_icon_size" />

</LinearLayout>

Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/menu/micropub_post_menu.xml
Expand Up @@ -3,41 +3,41 @@

<item
android:id="@+id/createNote"
android:icon="@drawable/note"
android:icon="@drawable/button_note_idle"
android:title="@string/add_note" />

<item
android:id="@+id/createArticle"
android:icon="@drawable/article"
android:icon="@drawable/button_article_idle"
android:title="@string/add_article" />

<item
android:id="@+id/createLike"
android:icon="@drawable/like"
android:icon="@drawable/button_like_idle"
android:title="@string/add_like" />

<item
android:id="@+id/createBookmark"
android:icon="@drawable/bookmark"
android:icon="@drawable/button_bookmark_idle"
android:title="@string/add_bookmark" />

<item
android:id="@+id/createReply"
android:icon="@drawable/reply"
android:icon="@drawable/button_reply_idle"
android:title="@string/add_reply" />

<item
android:id="@+id/createRepost"
android:icon="@drawable/repost"
android:icon="@drawable/button_repost_idle"
android:title="@string/add_repost" />

<item
android:id="@+id/createEvent"
android:icon="@drawable/event"
android:icon="@drawable/button_event_idle"
android:title="@string/add_event" />

<item
android:id="@+id/createRSVP"
android:icon="@drawable/rsvp"
android:icon="@drawable/button_rsvp_idle"
android:title="@string/add_rsvp" />
</menu>
4 changes: 2 additions & 2 deletions app/src/main/res/menu/post_action_menu.xml
Expand Up @@ -3,13 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:icon="@android:drawable/ic_menu_gallery"
android:icon="@drawable/outline_add_photo_alternate_white_48dp"
app:showAsAction="ifRoom"
android:id="@+id/addImage"
android:title="@string/add_image" />

<item
android:icon="@android:drawable/ic_menu_send"
android:icon="@drawable/ic_send_white_48dp"
app:showAsAction="ifRoom"
android:id="@+id/send"
android:onClick="onPostButtonClick"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/colors.xml
Expand Up @@ -4,7 +4,7 @@
<color name="colorPrimaryDark">#bd3e38</color>
<color name="colorAccent">#DD645E</color>
<color name="iconTint">#000000</color>
<color name="menuTextcolor">#D9000000</color>
<color name="menuTextcolor">#666666</color>
<color name="lightBlue">#b6cbdb</color>
<color name="textColor">#666666</color>
<color name="listBackgroundColor">#f5f5f5</color>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/dimens.xml
Expand Up @@ -10,5 +10,6 @@
<dimen name="timeline_list_item_author_size">16sp</dimen>
<dimen name="timeline_list_item_global">14sp</dimen>
<dimen name="timeline_list_divider_height">2px</dimen>
<dimen name="timeline_list_item_icon_size">25dp</dimen>
<dimen name="timeline_list_item_icon_margin_left">20dp</dimen>
</resources>
8 changes: 4 additions & 4 deletions app/src/main/res/values/strings.xml
Expand Up @@ -62,13 +62,13 @@
<!-- Preferences: share -->
<string name="pref_category_sharing_title">Share</string>
<string name="pref_category_sharing_summary">You can share text, URL\'s and images from other applications to Indigenous. You can also expose several post types (like, bookmark ..) as share intents directly.</string>
<string name="pref_summary_expose_like">Expose like in share intents. This will also immediately post the like to your endpoint.</string>
<string name="pref_summary_expose_like">Expose like in share intents. This will also immediately post the like to your micropub endpoint.</string>
<string name="pref_share_like_enabled">Enable like sharing</string>
<string name="pref_summary_expose_repost">Expose repost in share intents. This will also immediately post the repost to your endpoint.</string>
<string name="pref_summary_expose_repost">Expose repost in share intents. This will also immediately post the repost to your micropub endpoint.</string>
<string name="pref_share_repost_enabled">Enable repost sharing</string>
<string name="pref_summary_expose_bookmark">Expose bookmark in share intents. This will also immediately post the bookmark to your endpoint.</string>
<string name="pref_summary_expose_bookmark">Expose bookmark in share intents. This will also immediately post the bookmark to your micropub endpoint.</string>
<string name="pref_share_bookmark_enabled">Enable bookmark sharing</string>
<string name="pref_summary_expose_reply">Expose reply in share intents. This will not immediately post to your endpoint as you need still need to add a message.</string>
<string name="pref_summary_expose_reply">Expose reply in share intents. This will not immediately post to your micropub endpoint as you still need to add a message.</string>
<string name="pref_share_reply_enabled">Enable reply sharing</string>

<!-- Preferences: Media handling -->
Expand Down

0 comments on commit f08adce

Please sign in to comment.