Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove unnecessary layouts and fixed minor bugs. #1225

Merged
merged 2 commits into from
Mar 5, 2019
Merged

chore: Remove unnecessary layouts and fixed minor bugs. #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aacab22
Removed unnecessary layouts.
angmas1 Mar 4, 2019
f0b8662
Merge branch 'development' into base30
angmas1 Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
344 changes: 167 additions & 177 deletions app/src/main/res/layout-land/item_card_order_details.xml
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 10 additions & 16 deletions app/src/main/res/layout/content_event.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,25 +308,19 @@
android:layout_marginRight="@dimen/layout_margin_large"
android:orientation="horizontal">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.2">

<ImageView
android:id="@+id/logoIcon"
android:layout_width="@dimen/logo_icon_width"
android:layout_height="@dimen/logo_icon_height"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/layout_margin_small"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_account_circle_grey" />
</LinearLayout>
<ImageView
android:id="@+id/logoIcon"
android:layout_width="@dimen/logo_icon_width"
android:layout_height="@dimen/logo_icon_height"
android:layout_marginRight="@dimen/layout_margin_large"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/layout_margin_small"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_account_circle_grey" />

<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

<TextView
Expand Down
85 changes: 40 additions & 45 deletions app/src/main/res/layout/content_no_internet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/noInternetCard"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content"
android:layout_margin="@dimen/layout_margin_medium"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation">

<androidx.cardview.widget.CardView
android:id="@+id/noInternetCard"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/layout_margin_medium"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation">
android:layout_margin="@dimen/layout_margin_extra_large"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/layout_margin_extra_large"
android:orientation="vertical">

<ImageView
android:id="@+id/noInternetImageView"
android:layout_width="@dimen/item_image_view_large"
android:layout_height="@dimen/item_image_view_large"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_large"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_no_internet" />
<ImageView
android:id="@+id/noInternetImageView"
android:layout_width="@dimen/item_image_view_large"
android:layout_height="@dimen/item_image_view_large"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_large"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_no_internet" />

<TextView
android:id="@+id/noInternetTextview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_large"
android:text="@string/no_internet_message"
android:textSize="@dimen/text_size_medium"
tools:text="No Internet" />
<TextView
android:id="@+id/noInternetTextview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_large"
android:text="@string/no_internet_message"
android:textSize="@dimen/text_size_medium"
tools:text="No Internet" />

<TextView
android:id="@+id/retry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_large"
android:text="@string/retry"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/text_size_large"
tools:text="RETRY" />
</LinearLayout>
<TextView
android:id="@+id/retry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_large"
android:text="@string/retry"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/text_size_large"
tools:text="RETRY" />
</LinearLayout>

</androidx.cardview.widget.CardView>
</LinearLayout>
</androidx.cardview.widget.CardView>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_edit_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/colorPrimary"
app:backgroundTint="@color/colorPrimary"
android:text="@string/update"
android:textColor="@android:color/white" />

Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/layout/fragment_events.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
android:fillViewport="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down Expand Up @@ -113,6 +109,5 @@

<include layout="@layout/content_no_internet" />
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
11 changes: 6 additions & 5 deletions app/src/main/res/layout/fragment_order.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
android:layout_height="wrap_content"
android:id="@+id/orderCoordinatorLayout">

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
Expand Down Expand Up @@ -59,6 +57,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_small"
android:layout_marginRight="@dimen/layout_margin_medium"
android:layout_weight="0.1"
app:srcCompat="@drawable/ic_baseline_calendar" />
Expand Down Expand Up @@ -95,6 +94,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/layout_margin_medium"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/padding_medium"
Expand Down Expand Up @@ -138,6 +138,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="1">
Expand All @@ -148,17 +150,16 @@
android:layout_marginLeft="@dimen/layout_margin_large"
android:paddingLeft="@dimen/layout_margin_medium"
android:layout_weight="0.95"
android:textSize="13sp"
android:text="@string/invite"
android:textColor="@color/black" />

<ImageButton
android:id="@+id/share"
android:layout_width="@dimen/fab_width"
android:layout_height="@dimen/fab_height"
android:layout_margin="@dimen/layout_margin_medium"
android:background="@android:color/transparent"
app:srcCompat="@drawable/ic_share_grey" />

</LinearLayout>

<View
Expand Down
18 changes: 5 additions & 13 deletions app/src/main/res/layout/fragment_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,14 @@
app:srcCompat="@drawable/ic_account_circle_grey"
android:layout_marginBottom="@dimen/padding_large"/>

<LinearLayout
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">

<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/user_name"
android:textColor="@color/black"
android:textSize="@dimen/text_size_expanded_title" />

</LinearLayout>
android:text="@string/user_name"
android:textColor="@color/black"
android:textSize="@dimen/text_size_expanded_title" />

<TextView
android:id="@+id/email"
Expand All @@ -56,7 +49,6 @@
android:textAlignment="center"
android:textColor="@color/greyMore"
android:textSize="@dimen/text_size_medium" />

</LinearLayout>

<com.google.android.material.floatingactionbutton.FloatingActionButton
Expand Down
Loading