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.

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

proper indentations to xml files and fixes some issues #2773

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
Expand Down Expand Up @@ -41,4 +42,5 @@
app:menu="@menu/navigation" />

</LinearLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
21 changes: 17 additions & 4 deletions app/src/main/res/layout/content_event.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">

<data>

<variable
name="event"
type="org.fossasia.openevent.general.event.Event" />
Expand Down Expand Up @@ -152,6 +151,7 @@
tools:text="Wed June 5" />

</LinearLayout>

</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -182,6 +182,7 @@
android:layout_margin="@dimen/layout_margin_medium"
android:textColor="@color/dark_grey"
tools:text="Location" />

</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -210,6 +211,7 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/layout_margin_medium"
android:textColor="@color/dark_grey"/>

</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -311,6 +313,7 @@
android:textColor="@color/dark_grey"
android:textStyle="bold"
android:visibility="gone" />

</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -365,6 +368,7 @@
android:background="?selectableItemBackground"
android:scaleType="centerCrop"
android:src="@drawable/header" />

</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -455,7 +459,9 @@
android:textColor="@color/dark_grey"
android:textStyle="bold"
android:visibility="gone" />

</LinearLayout>

</LinearLayout>

<LinearLayout
Expand All @@ -470,6 +476,7 @@
android:animateLayoutChanges="true"
android:visibility="gone"
tools:visibility="visible">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -485,7 +492,9 @@
android:layout_marginBottom="@dimen/layout_margin_medium"
android:layout_height="wrap_content"
android:scrollbars="vertical" />

</LinearLayout>

</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -565,8 +574,8 @@
android:layout_marginBottom="@dimen/layout_margin_large"
android:textColor="@color/colorAccent"
android:text="@string/write_feedback" />
</LinearLayout>

</LinearLayout>

<LinearLayout
android:id="@+id/speakersContainer"
Expand Down Expand Up @@ -601,7 +610,6 @@
android:textColor="@color/dark_grey"
android:textSize="@dimen/event_details_headers" />


<androidx.recyclerview.widget.RecyclerView
android:id="@+id/speakerRv"
android:layout_width="wrap_content"
Expand Down Expand Up @@ -646,7 +654,6 @@
android:textColor="@color/dark_grey"
android:textSize="@dimen/event_details_headers" />


<androidx.recyclerview.widget.RecyclerView
android:id="@+id/sessionsRv"
android:layout_width="wrap_content"
Expand Down Expand Up @@ -702,6 +709,7 @@
android:orientation="vertical"
tools:itemCount="3"
tools:listitem="@layout/item_sponsor" />

</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -758,12 +766,17 @@
<include layout="@layout/placeholder_item_card_similar_events" />
<include layout="@layout/placeholder_item_card_similar_events" />
<include layout="@layout/placeholder_item_card_similar_events" />

</LinearLayout>

</com.facebook.shimmer.ShimmerFrameLayout>

</LinearLayout>

</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.core.widget.NestedScrollView>

</layout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/content_fetching_event_error.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
android:textColor="@color/colorPrimary"
style="@style/Widget.AppCompat.Button.Borderless"
tools:text="RETRY" />

</LinearLayout>

</androidx.cardview.widget.CardView>
1 change: 1 addition & 0 deletions app/src/main/res/layout/content_no_internet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
android:textColor="@color/colorPrimary"
style="@style/Widget.MaterialComponents.Button.TextButton"
tools:text="RETRY" />

</LinearLayout>

</androidx.cardview.widget.CardView>
4 changes: 4 additions & 0 deletions app/src/main/res/layout/dialog_change_password.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
android:drawableStart="@drawable/ic_lock_black"
android:hint="@string/new_password"
android:inputType="textPassword" />

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
Expand All @@ -68,6 +69,9 @@
android:drawableStart="@drawable/ic_lock_black"
android:hint="@string/confirm_new_password"
android:inputType="textPassword" />

</com.google.android.material.textfield.TextInputLayout>

</LinearLayout>

</ScrollView>
3 changes: 3 additions & 0 deletions app/src/main/res/layout/dialog_confirm_delete_account.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/padding_large">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -21,5 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"/>

</com.google.android.material.textfield.TextInputLayout>

</LinearLayout>
11 changes: 11 additions & 0 deletions app/src/main/res/layout/dialog_delete_account.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/padding_large">

<LinearLayout
android:id="@+id/confirmEmailLayout"
android:layout_width="match_parent"
Expand All @@ -13,6 +14,7 @@
android:layout_marginBottom="@dimen/layout_margin_medium"
android:visibility="gone"
tools:visibility="visible">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -30,14 +32,17 @@
android:id="@+id/email"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.button.MaterialButton
android:id="@+id/confirmEmailButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:enabled="false"
android:text="@string/confirm"/>

</LinearLayout>

<LinearLayout
Expand All @@ -47,22 +52,26 @@
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:background="@color/grey"
android:layout_marginBottom="@dimen/layout_margin_medium"/>

<CheckBox
android:id="@+id/confirmDeleteCheckbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/confirm_delete_checkbox_message"
android:textColor="@color/greyMore"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:orientation="horizontal">

<com.google.android.material.button.MaterialButton
android:id="@+id/cancelButton"
android:layout_width="wrap_content"
Expand All @@ -79,7 +88,9 @@
android:backgroundTint="@color/red"
android:enabled="false"
android:text="@string/delete"/>

</LinearLayout>

</LinearLayout>

</LinearLayout>
17 changes: 17 additions & 0 deletions app/src/main/res/layout/dialog_edit_profile_image.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,70 +15,87 @@
android:padding="@dimen/padding_large"
android:background="?selectableItemBackground"
android:orientation="vertical">

<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/icon_edit_profile_height"
android:padding="@dimen/padding_large"
android:src="@drawable/ic_crop"/>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/edit_image"/>

</LinearLayout>

<LinearLayout
android:id="@+id/replaceImage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/padding_large"
android:background="?selectableItemBackground"
android:orientation="vertical">

<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/icon_edit_profile_height"
android:padding="@dimen/padding_large"
android:src="@drawable/ic_image"/>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/replace_image"/>

</LinearLayout>

<LinearLayout
android:id="@+id/takeImage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/padding_large"
android:background="?selectableItemBackground"
android:orientation="vertical">

<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/icon_edit_profile_height"
android:padding="@dimen/padding_large"
android:src="@drawable/ic_camera"/>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/take_image"/>

</LinearLayout>

<LinearLayout
android:id="@+id/removeImage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/padding_large"
android:background="?selectableItemBackground"
android:orientation="vertical">

<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/icon_edit_profile_height"
android:padding="@dimen/padding_large"
android:src="@drawable/ic_trash"/>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/remove_image"/>

</LinearLayout>

</LinearLayout>

</androidx.core.widget.NestedScrollView>
1 change: 1 addition & 0 deletions app/src/main/res/layout/dialog_feedback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
android:layout_height="wrap_content"
android:hint="@string/write_feedback"
android:inputType="textCapSentences" />

</com.google.android.material.textfield.TextInputLayout>

</LinearLayout>
Loading