wassalam

src/client/SisterClient2/.idea/gradle.xml

@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="E:\Program Files\Android\Android Studio\gradle\gradle-2.2.1" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio1\gradle\gradle-2.2.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

src/client/SisterClient2/app/src/main/java/tugas/sister/sisterclient/FindItemActivity.java

@@ -5,58 +5,36 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
-import android.util.TypedValue;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TableRow;
-import android.widget.TextView;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-<<<<<<< HEAD
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-=======
 import java.io.BufferedReader;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
->>>>>>> 2655f8eae877e785f39925089bc68057dbd70346
 import java.net.Socket;
 
-
 public class FindItemActivity extends Activity {
     JSONObject request, response;
-<<<<<<< HEAD
-    String ip;
-    int port;
-=======
-    Socket socket;
-    String ip, port;
+    private String ip;
+    private int port;
+    private Socket socket;
     PrintWriter printWriter;
     DataInputStream is;
     DataOutputStream os;
     BufferedReader buffer;
-    String token = "123adsfja3sd0";
-    int item = 1;
->>>>>>> 2655f8eae877e785f39925089bc68057dbd70346
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_find_item);
-        try {
-            onFindItemResult(token, item);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
+
     }
+
     public void onFindItemResult(String token, int item) throws JSONException, IOException {
         Socket socket = new Socket(ip,port);
         socket.setSoTimeout(100);
@@ -65,68 +43,11 @@ public class FindItemActivity extends Activity {
         request.put("token",token);
         request.put("item",item);
 
-<<<<<<< HEAD
         BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
                 socket.getOutputStream()
         ));
         out.write(request.toString());
         out.flush();
         socket.close();
-=======
-        new ItemFinder().execute(request);
-    }
-
-    public class ItemFinder extends AsyncTask<JSONObject, Void, String>{
-
-        @Override
-        protected String doInBackground(JSONObject... req) {
-            String respons = null;
-            try{
-                respons = sendRequest();
-
-            }
-            catch(IOException e){
-                e.printStackTrace();
-            }
-
-            return respons;
-        }
-
-        public String sendRequest() throws IOException {
-            String resp = null;
-            try {
-                socket = new Socket(ip, Integer.parseInt(port));
-                socket.setSoTimeout(30);
-                is = new DataInputStream(socket.getInputStream());
-                os = new DataOutputStream(socket.getOutputStream());
-                printWriter = new PrintWriter(os);
-                buffer = new BufferedReader(new InputStreamReader(is));
-                resp = getResponse();
-            }
-            catch(IOException e){
-                e.printStackTrace();
-            }
-            return resp;
-        }
-
-        public String getResponse() throws IOException {
-            printWriter.println(request.toString());
-            printWriter.flush();
-
-            String inputLine;
-            String respons = null;
-            while((inputLine=buffer.readLine())!= null){
-                respons += inputLine;
-            }
-            is.close();
-            os.close();
-            return respons;
-        }
-
-        @Override
-        protected void onPostExecute(String response){
-
-        }
->>>>>>> 2655f8eae877e785f39925089bc68057dbd70346
     }
 }

src/client/SisterClient2/app/src/main/java/tugas/sister/sisterclient/MainActivity.java

@@ -82,15 +82,12 @@ public class MainActivity extends Activity {
                 response = in.readLine();
 
             } catch (UnknownHostException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
                 response = "UnknownHostException: " + e.toString();
             } catch (IOException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
                 response = "IOException: " + e.toString();
             } catch (Exception e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
                 response = "Exception: " + e.toString();
             } finally{
@@ -98,7 +95,6 @@ public class MainActivity extends Activity {
                     try {
                         socket.close();
                     } catch (IOException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                     }
                 }

src/client/SisterClient2/app/src/main/java/tugas/sister/sisterclient/RegisterActivity.java

@@ -29,7 +29,8 @@ public class RegisterActivity extends Activity {
     private DataOutputStream os ;
     private BufferedReader buffer;
     EditText username, password;
-    String ip, port;
+    private String ip;
+    private int port;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -43,7 +44,7 @@ public class RegisterActivity extends Activity {
         password = (EditText)findViewById(R.id.editText2);
         String pass = password.getText().toString();
 
-        socket = new Socket(ip,port);
+        socket = new Socket(ip, port);
         socket.setSoTimeout(100);
         request = new JSONObject();
         request.put("method", "signup");

src/client/SisterClient2/app/src/main/res/layout/activity_offer.xml

@@ -226,33 +226,71 @@
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:id="@+id/Button11"
-        android:layout_marginTop="73dp"
-        android:layout_below="@+id/textView6"
-        android:layout_toLeftOf="@+id/button2"
-        android:layout_toStartOf="@+id/button2" />
+        android:layout_below="@+id/textView11"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
 
     <Button
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:id="@+id/button12"
-        android:layout_below="@+id/Button11"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="62dp" />
     <Button
         android:layout_width="60dp"
         android:layout_height="40dp"
         android:text="OK"
         android:id="@+id/button13"
-        android:layout_above="@+id/button12"
-        android:layout_alignLeft="@+id/button14"
-        android:layout_alignStart="@+id/button14" />
+        android:layout_alignTop="@+id/editText5"
+        android:layout_alignLeft="@+id/textView9"
+        android:layout_alignStart="@+id/textView9" />
     <Button
         android:layout_width="60dp"
         android:layout_height="40dp"
         android:id="@+id/button14"
         android:text="Back"
+        android:layout_above="@+id/editText6"
+        android:layout_alignLeft="@+id/button13"
+        android:layout_alignStart="@+id/button13" />
+
+    <EditText
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:inputType="number"
+        android:ems="10"
+        android:id="@+id/editText5"
+        android:layout_alignBottom="@+id/Button11"
+        android:layout_toLeftOf="@+id/button8"
+        android:layout_toStartOf="@+id/button8" />
+
+    <EditText
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:inputType="number"
+        android:ems="10"
+        android:id="@+id/editText6"
         android:layout_alignBottom="@+id/button12"
-        android:layout_alignLeft="@+id/textView9"
-        android:layout_alignStart="@+id/textView9" />
+        android:layout_toRightOf="@+id/textView7"
+        android:layout_toEndOf="@+id/textView7" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Offered Item"
+        android:id="@+id/textView11"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Demanded Item"
+        android:id="@+id/textView12"
+        android:layout_above="@+id/button12"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
 
 </RelativeLayout>