midway

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/InitialDetailDialogs.java

@@ -0,0 +1,86 @@
+package com.scorelab.kute.kute.PrivateVehicles.App.Activities;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.content.res.ResourcesCompat;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.scorelab.kute.kute.R;
+
+
+public class InitialDetailDialogs extends AppCompatActivity implements View.OnClickListener {
+    TextView[]dots;
+    LinearLayout dotsLayout;
+    Button proceed,back;
+    int current_frag;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.details_dialog_activity);
+        dotsLayout = (LinearLayout) findViewById(R.id.layoutDots);
+        proceed = (Button) findViewById(R.id.btn_proceed1);
+        back = (Button) findViewById(R.id.btn_back);
+        proceed.setOnClickListener(this);
+        back.setOnClickListener(this);
+        back.setVisibility(View.INVISIBLE);
+        addBottomDots(0);
+    }
+    private void addBottomDots(int currentPage) {
+        dots = new TextView[3];
+
+        int colorsActive = ResourcesCompat.getColor(getResources(), R.color.dot_active, null);
+        int colorsInactive = ResourcesCompat.getColor(getResources(), R.color.dot_inactive, null);
+
+        dotsLayout.removeAllViews();
+        for (int i = 0; i < dots.length; i++) {
+            dots[i] = new TextView(this);
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // a certain method is not valid for versions below adroid nougat
+                dots[i].setText(Html.fromHtml("&#8226;", Html.FROM_HTML_MODE_COMPACT));
+            }
+            else
+            {
+                dots[i].setText(Html.fromHtml("&#8226;"));
+            }
+            dots[i].setTextSize(35);
+            dots[i].setTextColor(colorsInactive);
+            dotsLayout.addView(dots[i]);
+        }
+
+        if (dots.length > 0)
+            dots[currentPage].setTextColor(colorsActive);
+    }
+
+    @Override
+    public void onClick(View v) {
+
+        switch (v.getId()) {
+            case R.id.btn_proceed1:
+                handleFragmentNavigation();
+                break;
+            case R.id.btn_back:
+                handleFragmentNavigation();
+                break;
+
+        }
+    }
+    /************************ Custom Functions **********************************/
+    private void handleFragmentNavigation()
+    {
+        //Handle the fragment navigation
+        switch(current_frag)
+        {
+
+        }
+
+    }
+
+}

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/Main.java

@@ -91,7 +91,7 @@ public boolean onNavigationItemSelected(MenuItem item) {
         // Handle navigation view item clicks here.
         int id = item.getItemId();
         if (id == R.id.Home) {
-            // Handle the camera action
+            getSupportFragmentManager().beginTransaction().replace(R.id.frameDrawer, new HomeBaseFragment(), "HomeBaseFragment").commit();
         } else if (id == R.id.Profile) {
             setupProfileFragment();
         }

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/ProfilePictureActivity.java

@@ -52,6 +52,8 @@ public class ProfilePictureActivity extends AppCompatActivity implements View.On
     CoordinatorLayout cl;
     String yourBase64String;
     String TAG ="ProfilePictureActivity";
+    Boolean did_profile_image_change=false;
+    final int PROFILE_PICTURE_ACTIVITY_CODE=01;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -92,9 +94,16 @@ public void onClick(View v) {
                 break;
             case R.id.update:
                 String base_64=convertToBase64(current_image);
+                did_profile_image_change=true;
                 saveNewImageToDb(base_64);
                 break;
             case R.id.backNav:
+                Intent i=new Intent();
+                i.putExtra("DidProfileChange",did_profile_image_change);
+                if(did_profile_image_change) {
+                    i.putExtra("ImageBase64String",yourBase64String);
+                }
+                setResult(PROFILE_PICTURE_ACTIVITY_CODE,i);
                 finish();
                 break;
         }
@@ -309,15 +318,15 @@ private void base64ToBitmap(String base64)
     }
     private void saveNewImageToDb(String base_64)
     {
-        DatabaseReference db_ref= FirebaseDatabase.getInstance().getReference("Users").child(pref.getString("Id","null"));
-        db_ref.setValue(new Person(pref.getString("Name","null"),pref.getString("Id","null"),base_64)).addOnFailureListener(new OnFailureListener() {
+        DatabaseReference db_ref= FirebaseDatabase.getInstance().getReference("Users").child(pref.getString("Id","null")).child("img_base64");
+        db_ref.setValue(base_64).addOnFailureListener(new OnFailureListener() {
             @Override
             public void onFailure(@NonNull Exception e) {
                 Log.d(TAG,"Update profile Image Firebase:"+e.toString());
             }
         });
         //Change the Shared Preference Value
-        pref.edit().putString("Profile_Image",base_64).commit();
+        pref.edit().putString("Profile_Image",base_64).apply();
         Log.d(TAG,"Update Profile Image:Done");
     }
 

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/DataModels/Person.java

@@ -11,7 +11,7 @@ public class Person implements Serializable {
     /***************** Defing Properties ***********/
     //Add provision for vehicle
     //Make these variables private
-    public String id,name,img_url,occupation,other_details,contact_phone,vehicle;
+    public String id,name,img_base64,occupation,other_details,contact_phone,vehicle;
     //Implement in some other way public Boolean is_friend; // This will indicate whether the given person is users friend
     public ArrayList<Route> route_list;
     /*********** Properties Defined *******/
@@ -21,10 +21,10 @@ public Person() {
      /****************** This constructor will configure for the list item
      ****************** rest detail will be filled later when person detail activity is called *******/
 
-    public Person(String name,String id,String img_url)   //Add id and img_url(Not being added right now because we dont have the backend for now)
+    public Person(String name,String id,String img_base64)   //Add id and img_url(Not being added right now because we dont have the backend for now)
     {
         this.name=name;
-        this.img_url=img_url;
+        this.img_base64=img_base64;
         this.id=id;
     }
 

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/HomeBaseFragment.java

@@ -44,9 +44,9 @@ public class HomeBaseFragment extends Fragment {
     View v;
     BottomNavigationView bottomNavigation;
     FragmentManager fm;
-    HomeTab ht;
-    FriendTab ft;
-    MyRoutesTab mrt;
+    HomeTab home_tab;
+    FriendTab friend_tab;
+    MyRoutesTab my_routes_tab;
     ArrayList<Person> friend_list;
     SharedPreferences.OnSharedPreferenceChangeListener pref_change_listener;
     SharedPreferences prefs;
@@ -58,9 +58,9 @@ public class HomeBaseFragment extends Fragment {
     /***************************** Default Constructor ****************/
     public HomeBaseFragment() {
         Log.d(TAG, "Constructor");
-        ht = new HomeTab();
-        ft = new FriendTab();
-        mrt = new MyRoutesTab();
+        home_tab = new HomeTab();
+        friend_tab = new FriendTab();
+        my_routes_tab = new MyRoutesTab();
     }
 
     /***************************** Overrides ****************************/
@@ -98,11 +98,11 @@ public void onReceive(Context context, Intent intent) {
         //set initial fragments We have loaded all the three fragments simultaneously
         // inorder to smooth out the transition between the three fragments
         FragmentTransaction frag_transaction = fm.beginTransaction();
-        frag_transaction.add(R.id.frameBottomBar, ht, "HomeTab");
-        frag_transaction.add(R.id.frameBottomBar, ft, "FriendTab");
-        frag_transaction.add(R.id.frameBottomBar, mrt, "MyRoutesTab");
-        frag_transaction.hide(ft);
-        frag_transaction.hide(mrt);
+        frag_transaction.add(R.id.frameBottomBar, home_tab, "HomeTab");
+        frag_transaction.add(R.id.frameBottomBar, friend_tab, "FriendTab");
+        frag_transaction.add(R.id.frameBottomBar, my_routes_tab, "MyRoutesTab");
+        frag_transaction.hide(friend_tab);
+        frag_transaction.hide(my_routes_tab);
         frag_transaction.commit();
         bottomNavigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
@@ -204,52 +204,52 @@ private void sendMessageFriendTab(String Message,ArrayList<Person>friend_list1)
     /************************ FUnctions to toggle fragment visibility ***************/
     private void showHomeTab() {
         FragmentTransaction fragmentTransaction = fm.beginTransaction();
-        if (ht.isAdded()) {
-            fragmentTransaction.show(ht);
+        if (home_tab.isAdded()) {
+            fragmentTransaction.show(home_tab);
             Log.d(TAG, "Fragment transaction: HomeTab -> Found Previous One");
         } else {
-            fragmentTransaction.add(R.id.frameBottomBar, ht, "HomeTab");
+            fragmentTransaction.add(R.id.frameBottomBar, home_tab, "HomeTab");
         }
         //Hide The other two fragments
-        if (ft.isAdded()) {
-            fragmentTransaction.hide(ft);
+        if (friend_tab.isAdded()) {
+            fragmentTransaction.hide(friend_tab);
         }
-        if (mrt.isAdded()) {
-            fragmentTransaction.hide(mrt);
+        if (my_routes_tab.isAdded()) {
+            fragmentTransaction.hide(my_routes_tab);
         }
         fragmentTransaction.commit();
     }
 
     private void showFriendTab() {
         FragmentTransaction fragmentTransaction = fm.beginTransaction();
-        if (ft.isAdded()) {
-            fragmentTransaction.show(ft);
+        if (friend_tab.isAdded()) {
+            fragmentTransaction.show(friend_tab);
         } else {
-            fragmentTransaction.add(R.id.frameBottomBar, ft, "FriendTab");
+            fragmentTransaction.add(R.id.frameBottomBar, friend_tab, "FriendTab");
         }
         //Hide The other two fragments
-        if (ft.isAdded()) {
-            fragmentTransaction.hide(ht);
+        if (friend_tab.isAdded()) {
+            fragmentTransaction.hide(home_tab);
         }
-        if (mrt.isAdded()) {
-            fragmentTransaction.hide(mrt);
+        if (my_routes_tab.isAdded()) {
+            fragmentTransaction.hide(my_routes_tab);
         }
         fragmentTransaction.commit();
     }
 
     private void showMyRoutesTab() {
         FragmentTransaction fragmentTransaction = fm.beginTransaction();
-        if (mrt.isAdded()) {
-            fragmentTransaction.show(mrt);
+        if (my_routes_tab.isAdded()) {
+            fragmentTransaction.show(my_routes_tab);
         } else {
-            fragmentTransaction.add(R.id.frameBottomBar, mrt, "MyRoutesTab");
+            fragmentTransaction.add(R.id.frameBottomBar, my_routes_tab, "MyRoutesTab");
         }
         //Hide The other two fragments
-        if (ft.isAdded()) {
-            fragmentTransaction.hide(ft);
+        if (friend_tab.isAdded()) {
+            fragmentTransaction.hide(friend_tab);
         }
-        if (mrt.isAdded()) {
-            fragmentTransaction.hide(ht);
+        if (my_routes_tab.isAdded()) {
+            fragmentTransaction.hide(home_tab);
         }
         fragmentTransaction.commit();
     }

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/InitialDetailDialogFragments/FirstInfoFragment.java

@@ -0,0 +1,28 @@
+package com.scorelab.kute.kute.PrivateVehicles.App.Fragments.InitialDetailDialogFragments;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.scorelab.kute.kute.R;
+
+/**
+ * Created by nipunarora on 07/07/17.
+ */
+
+public class FirstInfoFragment extends Fragment {
+    View v;
+
+    public FirstInfoFragment() {
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        v=inflater.inflate(R.layout.starting_detail_dialog_fragment,container,false);
+        return  v;
+    }
+}

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/InitialDetailDialogFragments/SecondConatctFragment.java

@@ -0,0 +1,25 @@
+package com.scorelab.kute.kute.PrivateVehicles.App.Fragments.InitialDetailDialogFragments;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Created by nipunarora on 07/07/17.
+ */
+
+public class SecondConatctFragment extends Fragment {
+    View v;
+
+    public SecondConatctFragment() {
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+}

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/InitialDetailDialogFragments/ThirdVehicleFragment.java

@@ -0,0 +1,25 @@
+package com.scorelab.kute.kute.PrivateVehicles.App.Fragments.InitialDetailDialogFragments;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Created by nipunarora on 07/07/17.
+ */
+
+public class ThirdVehicleFragment extends Fragment {
+    View v;
+
+    public ThirdVehicleFragment() {
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+}