Merge pull request #17 from Cau-Coin/gunhee

final application
Cau-Coin · Nov 4, 2018 · f13b7fe · f13b7fe
2 parents 88865de + a41b49f
commit f13b7fe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/app/src/main/java/com/example/cau_coin/DetailReviewActivity.java b/app/src/main/java/com/example/cau_coin/DetailReviewActivity.java
@@ -317,9 +317,9 @@ public void onBackPressed() {
         a.putExtra("filter_grade", filter_grade);
         a.putExtra("filter_semester", filter_semester);
         a.putExtra("num_Filter", num_Filter);
-        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
         startActivity(a);
         finish();
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
     }
 
     // Score과 Comment를 부여하는것에 대한 Transaction 전송
@@ -425,14 +425,11 @@ public String doInBackground(String... params) {
                     }
                 } else {
                     if (randomNum == 0) {
-                        //url = "http://115.68.207.101:4444/read_one_data/" + evaluateId + "&" + id;
-                        url = "http://115.68.207.101:4444/read_one_data/" + evaluateId;
+                        url = "http://115.68.207.101:4444/read_one_data/" + evaluateId + "/" + id;
                     } else if (randomNum == 1) {
-                        //url = "http://115.68.232.77:4444/read_one_data/" + evaluateId + "&" + id;
-                        url = "http://115.68.232.77:4444/read_one_data/" + evaluateId;
+                        url = "http://115.68.232.77:4444/read_one_data/" + evaluateId + "/" + id;
                     } else {
-                        //url = "http://115.68.232.78:4444/read_one_data/" + evaluateId + "&" + id;
-                        url = "http://115.68.232.78:4444/read_one_data/" + evaluateId;
+                        url = "http://115.68.232.78:4444/read_one_data/" + evaluateId + "/" + id;
                     }
                 }
                 URL obj = new URL(url);

diff --git a/app/src/main/res/layout/activity_detailreview.xml b/app/src/main/res/layout/activity_detailreview.xml
@@ -64,7 +64,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="1dp"
                     android:layout_marginBottom="1dp"
                     android:background="#ffffff"
@@ -233,26 +233,23 @@
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="20dp"
+                        android:layout_height="wrap_content"
                         android:layout_marginLeft="15dp"
                         android:layout_marginTop="4dp"
                         android:orientation="horizontal">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="한줄평" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:layout_weight="1" />
+                            android:text="한줄평"
+                            android:paddingRight="20dp"/>
 
                         <TextView
                             android:id="@+id/detail_review"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginRight="15dp"
+                            android:textAlignment="viewEnd"
                             android:text="" />
                     </LinearLayout>
                 </LinearLayout>
@@ -666,6 +663,7 @@
                             android:inputType="text"
                             android:background="@null"
                             android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"
                             android:imeOptions="actionSend"
                             android:textSize="15dp" />
                     </LinearLayout>

diff --git a/app/src/main/res/layout/activity_write.xml b/app/src/main/res/layout/activity_write.xml
@@ -517,6 +517,7 @@
                                     android:layout_height="50dp"
                                     android:background="@null"
                                     android:paddingLeft="10dp"
+                                    android:paddingRight="10dp"
                                     android:textColor="@color/ratingsColor"
                                     android:textColorHint="@color/ratingsColor"
                                     android:inputType="text"