Implement new report submittion fragment

app/src/main/java/lt/vilnius/tvarkau/MainActivity.java

@@ -7,7 +7,6 @@
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import butterknife.OnLongClick;
 import lt.vilnius.tvarkau.activity.ReportRegistrationActivity;
 import lt.vilnius.tvarkau.utils.GlobalConsts;
 import lt.vilnius.tvarkau.utils.PermissionUtils;
@@ -50,18 +49,10 @@ protected void startNewActivity(Class<?> cls, Bundle data) {
 
     @OnClick(R.id.home_report_problem)
     protected void onNewIssueClicked() {
-        Intent intent = new Intent(this, NewProblemActivity.class);
-        startActivityForResult(intent, NEW_ISSUE_REQUEST_CODE);
-    }
-
-    @OnLongClick(R.id.home_report_problem)
-    protected boolean onNewIssueLongClicked() {
         Intent intent = new Intent(this, ReportRegistrationActivity.class);
         startActivityForResult(intent, NEW_ISSUE_REQUEST_CODE);
-        return true;
     }
 
-
     @OnClick(R.id.home_list_of_problems)
     protected void onProblemsListClicked() {
         Intent intent = ProblemsListActivity.getStartActivityIntent(this, ALL_PROBLEMS);

app/src/main/java/lt/vilnius/tvarkau/NewProblemActivity.java

@@ -67,8 +67,8 @@
 
 public class NewProblemActivity extends BaseActivity implements NewProblemPhotosPagerAdapter.OnPhotoClickedListener {
 
-    private static final int TAKE_PHOTO_PERMISSIONS_REQUEST_CODE = 10;
-    private static final int MAP_PERMISSION_REQUEST_CODE = 20;
+    public static final int TAKE_PHOTO_PERMISSIONS_REQUEST_CODE = 10;
+    public static final int MAP_PERMISSION_REQUEST_CODE = 20;
 
     public static final int REQUEST_PLACE_PICKER = 11;
     public static final int REQUEST_PERSONAL_DATA = 12;

app/src/main/java/lt/vilnius/tvarkau/activity/ReportRegistrationActivity.kt

@@ -2,20 +2,32 @@ package lt.vilnius.tvarkau.activity
 
 import android.os.Bundle
 import lt.vilnius.tvarkau.BaseActivity
+import lt.vilnius.tvarkau.fragments.NewReportFragment
 import lt.vilnius.tvarkau.fragments.ReportTypeListFragment
 
 class ReportRegistrationActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            supportFragmentManager
+                    .beginTransaction()
+                    .replace(android.R.id.content, ReportTypeListFragment.newInstance())
+                    .commit()
+        }
+    }
+
+    fun onTypeSelected(reportType: String) {
         supportFragmentManager
                 .beginTransaction()
-                .replace(android.R.id.content, ReportTypeListFragment.newInstance())
+                .replace(android.R.id.content, NewReportFragment.newInstance(reportType))
+                .addToBackStack(null)
                 .commit()
     }
 
-    fun onTypeSelected(reportType: String) {
-        //TODO next fragment
+    fun onReportSubmitted() {
+        setResult(RESULT_OK)
+        finish()
     }
 
     override fun onBackPressed() {

app/src/main/java/lt/vilnius/tvarkau/backend/ApiRequest.java

@@ -1,5 +1,7 @@
 package lt.vilnius.tvarkau.backend;
 
+import android.support.annotation.VisibleForTesting;
+
 public class ApiRequest<P> {
 
     private String method;
@@ -11,4 +13,9 @@ public ApiRequest(ApiMethod method, P params) {
         this.id = method.getId();
         this.params = params;
     }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    public P getParams() {
+        return params;
+    }
 }

app/src/main/java/lt/vilnius/tvarkau/backend/GetNewProblemParams.java

@@ -35,6 +35,10 @@ public GetNewProblemParams(String sessionId, String description, String type, St
 
     }
 
+    public String[] getPhoto() {
+        return photo;
+    }
+
     public static class Builder {
         private String sessionId;
         private String description;

app/src/main/java/lt/vilnius/tvarkau/entity/Profile.java

@@ -1,16 +1,10 @@
 package lt.vilnius.tvarkau.entity;
 
-import android.content.Context;
-import android.os.Parcel;
-import android.os.Parcelable;
-
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
 import org.threeten.bp.LocalDate;
 
-import lt.vilnius.tvarkau.utils.SharedPrefsManager;
-
 
 public class Profile {
 
@@ -53,8 +47,16 @@ public String getMobilePhone() {
         return mobilePhone;
     }
 
-    public static Profile returnProfile(Context con) {
-        return SharedPrefsManager.getInstance(con).getUserProfile();
+    public void setBirthday(LocalDate birthday) {
+        this.birthday = birthday;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone;
     }
 
     public String createJsonData() {
@@ -73,9 +75,9 @@ public boolean equals(Object o) {
             Profile profile = (Profile) o;
 
             return name.equals(profile.getName()) &&
-                birthday.equals(profile.getBirthday()) &&
-                email.equals(profile.getEmail()) &&
-                mobilePhone.equals(profile.getMobilePhone());
+                    birthday.equals(profile.getBirthday()) &&
+                    email.equals(profile.getEmail()) &&
+                    mobilePhone.equals(profile.getMobilePhone());
         }
 
         return false;

app/src/main/java/lt/vilnius/tvarkau/fragments/BaseFragment.kt

@@ -37,4 +37,8 @@ abstract class BaseFragment : Fragment() {
 
         analytics.trackCurrentFragment(activity, this)
     }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+    }
 }