Skip to content

Commit

Permalink
layout fix
Browse files Browse the repository at this point in the history
  • Loading branch information
nuclearfog committed Oct 9, 2018
1 parent 1d6f635 commit 023c2ba
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 4 deletions.
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_dm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/layout_margin"
android:layout_marginLeft="@dimen/layout_margin"
android:orientation="vertical">

<LinearLayout
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_trend.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/layout_margin"
android:layout_marginRight="@dimen/layout_margin"
android:layout_weight="1"
android:gravity="center_vertical|end"
android:textAlignment="gravity" />
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/layout/item_tweet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
style="@style/ProfileImageCardView"
android:layout_width="@dimen/profile_small"
android:layout_height="@dimen/profile_small"
android:layout_gravity="center_vertical"
android:contentDescription="@string/profile_image" />

</android.support.v7.widget.CardView>
Expand All @@ -37,6 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin"
android:layout_marginLeft="@dimen/layout_margin"
android:orientation="vertical">

<LinearLayout
Expand All @@ -50,6 +50,7 @@
android:layout_height="@dimen/icon_size"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/verify"
android:visibility="gone"
app:srcCompat="@drawable/verify" />
Expand Down Expand Up @@ -104,11 +105,11 @@
android:singleLine="true"
android:textSize="12sp" />


<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/retweet"
app:srcCompat="@drawable/retweet" />

Expand All @@ -124,6 +125,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/favorite"
app:srcCompat="@drawable/favorite_tweet" />

Expand All @@ -139,5 +141,4 @@

</LinearLayout>

</android.support.v7.widget.CardView>

</android.support.v7.widget.CardView>
3 changes: 3 additions & 0 deletions app/src/main/res/layout/item_user.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin"
android:layout_marginLeft="@dimen/layout_margin"
android:orientation="vertical">

<LinearLayout
Expand All @@ -42,6 +43,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/verify"
android:visibility="gone"
app:srcCompat="@drawable/verify" />
Expand All @@ -66,6 +68,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/profile_locked"
android:visibility="gone"
app:srcCompat="@drawable/lock" />
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout/page_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
android:layout_width="@dimen/button_size"
android:layout_height="@dimen/button_size"
android:layout_marginEnd="@dimen/layout_margin"
android:layout_marginRight="@dimen/layout_margin"
app:srcCompat="@drawable/key" />

<EditText
Expand All @@ -44,6 +45,7 @@
android:layout_width="@dimen/button_size"
android:layout_height="@dimen/button_size"
android:layout_marginStart="@dimen/layout_margin"
android:layout_marginLeft="@dimen/layout_margin"
android:background="@android:color/transparent"
app:srcCompat="@drawable/copy" />

Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/layout/page_profile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/layout_margin"
android:layout_marginLeft="@dimen/layout_margin"
android:orientation="vertical">

<LinearLayout
Expand All @@ -69,6 +70,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/verify"
android:visibility="gone"
app:srcCompat="@drawable/verify" />
Expand All @@ -92,6 +94,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/profile_locked"
android:visibility="gone"
app:srcCompat="@drawable/lock" />
Expand All @@ -115,6 +118,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/followback"
android:visibility="gone"
app:srcCompat="@drawable/followback" />
Expand All @@ -125,6 +129,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:visibility="invisible"
app:srcCompat="@drawable/following" />

Expand All @@ -139,6 +144,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:visibility="invisible"
app:srcCompat="@drawable/follower" />

Expand Down Expand Up @@ -172,6 +178,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:visibility="gone"
app:srcCompat="@drawable/location" />

Expand All @@ -194,6 +201,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:visibility="gone"
app:srcCompat="@drawable/link" />

Expand All @@ -219,6 +227,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:visibility="gone"
app:srcCompat="@drawable/calendar" />

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout/page_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/settings_button"
android:layout_marginStart="@dimen/side_padding"
android:layout_marginLeft="@dimen/side_padding"
android:layout_weight="1"
android:text="@string/image" />

Expand Down Expand Up @@ -148,6 +149,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/side_padding"
android:layout_marginLeft="@dimen/side_padding"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/woeid"
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/layout/page_tweet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin"
android:layout_marginLeft="@dimen/layout_margin"
android:gravity="center"
android:orientation="vertical">

Expand All @@ -75,6 +76,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
android:contentDescription="@string/verify"
android:visibility="gone"
app:srcCompat="@drawable/verify" />
Expand Down Expand Up @@ -160,6 +162,7 @@
android:layout_width="@dimen/tweet_page_icon"
android:layout_height="@dimen/tweet_page_icon"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
app:srcCompat="@drawable/chat" />

<TextView
Expand All @@ -177,6 +180,7 @@
android:layout_width="@dimen/tweet_page_icon"
android:layout_height="@dimen/tweet_page_icon"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
app:srcCompat="@drawable/retweet" />

<TextView
Expand All @@ -194,6 +198,7 @@
android:layout_width="@dimen/tweet_page_icon"
android:layout_height="@dimen/tweet_page_icon"
android:layout_marginEnd="@dimen/icon_margin"
android:layout_marginRight="@dimen/icon_margin"
app:srcCompat="@drawable/favorite" />

<TextView
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout/popup_dm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
android:layout_width="@dimen/dm_button_size"
android:layout_height="@dimen/dm_button_size"
android:layout_marginStart="@dimen/dm_icon_margin"
android:layout_marginLeft="@dimen/dm_icon_margin"
app:srcCompat="@drawable/image" />

<ImageView
android:id="@+id/dm_send"
android:layout_width="@dimen/dm_button_size"
android:layout_height="@dimen/dm_button_size"
android:layout_marginStart="@dimen/button_margin"
android:layout_marginLeft="@dimen/button_margin"
app:srcCompat="@drawable/right" />

</LinearLayout>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/layout/popup_tweet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
android:layout_width="@dimen/tweet_button_size"
android:layout_height="@dimen/tweet_button_size"
android:layout_marginStart="@dimen/tweet_icon_margin"
android:layout_marginLeft="@dimen/tweet_icon_margin"
android:visibility="invisible"
app:srcCompat="@drawable/preview" />

Expand All @@ -47,20 +48,23 @@
android:layout_width="@dimen/tweet_button_size"
android:layout_height="@dimen/tweet_button_size"
android:layout_marginStart="@dimen/tweet_icon_margin"
android:layout_marginLeft="@dimen/tweet_icon_margin"
app:srcCompat="@drawable/image" />

<ImageView
android:id="@+id/sendTweet"
android:layout_width="@dimen/tweet_button_size"
android:layout_height="@dimen/tweet_button_size"
android:layout_marginStart="@dimen/tweet_icon_margin"
android:layout_marginLeft="@dimen/tweet_icon_margin"
app:srcCompat="@drawable/tweet" />

<ImageView
android:id="@+id/close"
android:layout_width="@dimen/tweet_button_size"
android:layout_height="@dimen/tweet_button_size"
android:layout_marginStart="@dimen/tweet_icon_margin"
android:layout_marginLeft="@dimen/tweet_icon_margin"
app:srcCompat="@drawable/cross" />

</LinearLayout>
Expand Down

0 comments on commit 023c2ba

Please sign in to comment.