Skip to content

Commit

Permalink
Fixes project-travel-mate#705 fixed changes UI of activity_my_trip_info
Browse files Browse the repository at this point in the history
  • Loading branch information
@AminullahTajMuhammad
AminullahTajMuhammad committed Oct 5, 2019
1 parent 3951a0b commit 0f9a900
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 60 deletions.
13 changes: 10 additions & 3 deletions Android/app/src/main/java/io/github/project_travel_mate/mytrips/MyTripInfoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.os.Looper;
import android.os.StrictMode;
import android.preference.PreferenceManager;
import android.support.constraint.ConstraintLayout;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AlertDialog;
Expand Down Expand Up @@ -120,7 +121,11 @@ public class MyTripInfoActivity extends AppCompatActivity implements TravelmateS
@BindView(R.id.addme_to_trip)
LinearLayout addMeToTrip;
@BindView(R.id.public_trip_layout)
RelativeLayout publicPrivateInfo;
ConstraintLayout publicPrivateInfo;
@BindView(R.id.label_trip_name)
TextView labelTripName;
@BindView(R.id.label_trip_date)
TextView labelTripDate;

private String mFriendId = null;
private String mFriendDeleteId = null;
Expand Down Expand Up @@ -628,17 +633,19 @@ public void onResponse(Call call, final Response response) throws IOException {
addNewFriend.setVisibility(GONE);
friendEmail.setVisibility(GONE);
noFriendTitle.setVisibility(VISIBLE);
noFriendTitle.setTypeface(null, Typeface.BOLD);
// noFriendTitle.setTypeface(null, Typeface.BOLD);
String mystring = getString(R.string.friends_title);
SpannableString content = new SpannableString(mystring);
content.setSpan(new UnderlineSpan(), 0, mystring.length(), 0);
noFriendTitle.setText(content);
noFriendTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15f);
// noFriendTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15f);

addNewFriend.setVisibility(VISIBLE);
friendEmail.setVisibility(VISIBLE);
addMeToTrip.setVisibility(GONE);
publicPrivateInfo.setVisibility(VISIBLE);
labelTripName.setVisibility(VISIBLE);
labelTripDate.setVisibility(VISIBLE);

if (isTripPublic) {
tripPublicMessage.setText(R.string.trip_public_message);
Expand Down
10 changes: 10 additions & 0 deletions Android/app/src/main/res/drawable/my_trip_detail_button_shape.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorAccent" />
<!--border color and border width-->
<stroke
android:width="3dp"
android:color="#00000000" />
<!--border radius in dp-->
<corners android:radius="7dp" />
</shape>
2 changes: 1 addition & 1 deletion Android/app/src/main/res/layout/activity_my_trip_info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
android:contentDescription="@string/empty_description"
android:scaleType="centerCrop"
android:src="@drawable/placeholder_image"
android:visibility="gone"
android:visibility="visible"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_collapseMode="parallax" />

Expand Down
148 changes: 93 additions & 55 deletions Android/app/src/main/res/layout/content_my_trip_info.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>

<android.support.v4.widget.NestedScrollView 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:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="io.github.project_travel_mate.mytrips.MyTripInfoActivity"
tools:showIn="@layout/activity_city_info">
tools:context="io.github.project_travel_mate.mytrips.MyTripInfoActivity">

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -34,6 +32,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
android:orientation="horizontal">

<TextView
Expand All @@ -44,48 +43,44 @@
android:layout_weight="1"
android:fontFamily="sans-serif-bold"
android:padding="10dp"
android:text="Chennai"
android:textColor="@color/black"
android:textSize="25sp"
android:visibility="gone"
android:textStyle="bold" />

<TextView
android:id="@+id/trip_start_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/city_name"
android:layout_alignParentBottom="false"
android:layout_alignParentStart="false"
android:layout_alignParentTop="false"
android:layout_toRightOf="@+id/city_name"
android:layout_weight="1"
android:fontFamily="sans-serif-bold"
android:gravity="top"
android:paddingBottom="10dp"
android:paddingEnd="10dp"
android:paddingTop="10dp"
android:textColor="@color/black"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView android:id="@+id/label_trip_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:textSize="20sp"
android:text="Trip Name: "
android:visibility="gone"
android:layout_marginLeft="1dp"/>

<EditText
android:id="@+id/trip_name"
android:layout_width="318dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@android:color/transparent"
android:cursorVisible="false"
android:ellipsize="end"
android:text="My Trip"
android:textStyle="bold"
android:focusableInTouchMode="false"
android:fontFamily="sans-serif-bold"
android:inputType="text"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
android:visibility="invisible" />
android:textSize="20sp"
android:visibility="gone"
android:layout_toRightOf="@+id/label_trip_name"/>

<ProgressBar
android:id="@+id/trip_name_progress_bar"
Expand All @@ -105,16 +100,42 @@
android:padding="10dp"
android:paddingBottom="13dp"
android:src="@drawable/ic_edit_black_24dp" />

<TextView android:id="@+id/label_trip_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/trip_name"
android:visibility="gone"
android:text="Trip Date: "
android:padding="10dp"
android:textSize="20sp"
android:layout_marginLeft="1dp"/>


<TextView
android:id="@+id/trip_start_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/label_trip_date"
android:layout_below="@+id/trip_name"
android:fontFamily="sans-serif-bold"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="20sp"
android:textStyle="bold"
android:text="25/Aug"
android:visibility="gone"/>
</RelativeLayout>

<TextView
android:id="@+id/no_friend_title"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginLeft="13dp"
android:layout_marginRight="15dp"
android:layout_marginTop="20dp"
android:paddingLeft="5dp"
android:textSize="18dp"
android:textColor="@color/black"
android:visibility="gone" />

<RelativeLayout
Expand Down Expand Up @@ -155,7 +176,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:backgroundTint="@color/black"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:backgroundTint="@color/colorAccent"
android:ems="10"
android:focusable="true"
android:focusableInTouchMode="true"
Expand All @@ -167,51 +190,69 @@
android:visibility="gone"
tools:targetApi="lollipop" />

<TextView
<Button
android:id="@+id/add_new_friend"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/round_shape"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/my_trip_detail_button_shape"
android:orientation="horizontal"
android:padding="15dp"
android:text="@string/prompt_add_friend"
android:textColor="@color/white"
android:visibility="gone" />


<RelativeLayout
<android.support.constraint.ConstraintLayout
android:visibility="gone"
android:id="@+id/public_trip_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="50dp">

<TextView
android:id="@+id/public_trip_message"
android:layout_width="300dp"
<TextView android:id="@+id/label_trip_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Trip Type: "
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textColor="@color/black"
android:textStyle="bold"
android:textSize="20dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_toStartOf="@+id/ispublic_toggleButton"
android:fontFamily="sans-serif-bold"
android:padding="5dp"
android:textColor="#000000"
android:textSize="15sp" />
/>

<ToggleButton
android:id="@+id/ispublic_toggleButton"
android:layout_width="wrap_content"
android:layout_height="53dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:padding="10dp"
android:background="@drawable/round_shape"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintLeft_toRightOf="@+id/label_trip_type"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@+id/label_trip_type"
android:layout_marginEnd="15dp"
android:layout_marginStart="10dp"
android:background="@drawable/my_trip_detail_button_shape"
android:textColor="@color/white"
android:textOn="@string/public_trip_toggle_on"
android:textOff="@string/public_trip_toggle_off" />
</RelativeLayout>

<TextView
android:id="@+id/public_trip_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-bold"
android:textColor="#000000"
android:textSize="18sp"
android:layout_marginTop="7dp"
android:text="@string/trip_private_message"
app:layout_constraintStart_toStartOf="@+id/label_trip_type"
app:layout_constraintEnd_toEndOf="@+id/ispublic_toggleButton"
app:layout_constraintTop_toBottomOf="@+id/ispublic_toggleButton"/>

</android.support.constraint.ConstraintLayout>


<LinearLayout
Expand Down Expand Up @@ -248,10 +289,7 @@
android:text="@string/add_me_to_trip"
android:textSize="18sp" />
</LinearLayout>

</LinearLayout>

</LinearLayout>

</LinearLayout>
</android.support.v4.widget.NestedScrollView>
1 change: 0 additions & 1 deletion Android/config/quality/checkstyle_config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<module name="Checker">

<property name="charset" value="UTF-8" />

<property name="severity" value="error" />
Expand Down

0 comments on commit 0f9a900

Please sign in to comment.