diff --git a/.idea/misc.xml b/.idea/misc.xml index 5157fcf..b92d576 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -55,7 +55,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 59c6f87..f6a7e6a 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,9 +4,11 @@ apply plugin: 'com.android.application' apply plugin: 'com.neenbedankt.android-apt' + def computeVersionName() { return "1.0" } + android { signingConfigs { } @@ -57,11 +59,14 @@ dependencies { //compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha1' compile 'org.greenrobot:eventbus:3.0.0' + compile files('libs/robotium-solo-5.6.1.jar') + //Dagger + //compile 'com.squareup.picasso:picasso:2.5.2' compile 'org.greenrobot:eventbus:3.0.0' compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.android.support:support-v4:24.2.1' compile 'com.android.support:design:24.2.1' - compile 'com.google.firebase:firebase-core:9.4.0' + compile 'com.google.firebase:firebase-core:9.6.1' compile 'net.hockeyapp.android:HockeySDK:4.0.1' compile 'org.greenrobot:greendao:3.1.0' compile 'com.loopj.android:android-async-http:1.4.9' @@ -72,20 +77,17 @@ dependencies { compile 'com.android.support:gridlayout-v7:24.2.1' compile 'org.apache.commons:commons-io:1.3.2' compile 'com.firebase:firebase-client-android:2.4.0' - compile 'com.google.firebase:firebase-messaging:9.4.0' + compile 'com.google.firebase:firebase-messaging:9.6.1' compile 'com.facebook.stetho:stetho:1.4.0' compile 'com.facebook.stetho:stetho-urlconnection:1.4.0' - compile 'com.google.android.gms:play-services-maps:9.4.0' + compile 'com.google.android.gms:play-services-maps:9.6.1' compile 'com.android.support:recyclerview-v7:24.2.1' - testCompile 'junit:junit:4.12' - compile files('libs/robotium-solo-5.6.1.jar') compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha8' - //Dagger compile 'com.google.dagger:dagger:2.0' - apt 'com.google.dagger:dagger-compiler:2.0' - //compile 'com.squareup.picasso:picasso:2.5.2' compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.android.support:cardview-v7:24.2.1' + testCompile 'junit:junit:4.12' + apt 'com.google.dagger:dagger-compiler:2.0' } apply plugin: 'com.google.gms.google-services' apply plugin: 'org.greenrobot.greendao' \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8cae020..181d533 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,5 @@ - + @@ -119,9 +117,17 @@ android:name=".recyclerviewexample.ScrollingActivity" android:label="@string/title_activity_scrolling" android:theme="@style/AppTheme.NoActionBar"> +<<<<<<< HEAD + + + + + +======= +>>>>>>> master diff --git a/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/RestTask.java b/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/RestTask.java new file mode 100644 index 0000000..9f38839 --- /dev/null +++ b/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/RestTask.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2016. Pritesh Patel, Toronto, Canada + */ + +package com.moxdroid.interview.tabviewpagerexample.python; + +/** + * Created by pritesh.patel on 2016-10-21, 1:23 PM. + * ADESA, Canada + */ + +import android.content.Context; +import android.content.Intent; +import android.os.AsyncTask; +import android.util.Log; + +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.impl.client.BasicResponseHandler; +import org.apache.http.impl.client.DefaultHttpClient; + +/** + * Android RestTask (REST) from the Android Recipes book. + */ +public class RestTask extends AsyncTask +{ + private static final String TAG = "AARestTask"; + public static final String HTTP_RESPONSE = "httpResponse"; + + private Context mContext; + private HttpClient mClient; + private String mAction; + + public RestTask(Context context, String action) + { + mContext = context; + mAction = action; + mClient = new DefaultHttpClient(); + } + + public RestTask(Context context, String action, HttpClient client) + { + mContext = context; + mAction = action; + mClient = client; + } + + @Override + protected String doInBackground(HttpUriRequest... params) + { + try + { + HttpUriRequest request = params[0]; + HttpResponse serverResponse = mClient.execute(request); + BasicResponseHandler handler = new BasicResponseHandler(); + return handler.handleResponse(serverResponse); + } + catch (Exception e) + { + // TODO handle this properly + e.printStackTrace(); + return ""; + } + } + + @Override + protected void onPostExecute(String result) + { + Log.i(TAG, "RESULT = " + result); + Intent intent = new Intent(mAction); + intent.putExtra(HTTP_RESPONSE, result); + + // broadcast the completion + mContext.sendBroadcast(intent); + } + +} + diff --git a/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/TestActivity.java b/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/TestActivity.java new file mode 100644 index 0000000..f6e6e80 --- /dev/null +++ b/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/TestActivity.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016. Pritesh Patel, Toronto, Canada + */ + +package com.moxdroid.interview.tabviewpagerexample.python; + +import android.content.res.Configuration; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; + +import com.moxdroid.interview.tabviewpagerexample.R; + +public class TestActivity extends AppCompatActivity +{ + + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_test); + + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { + // if the screen is in landscape mode, we can show the + // dialog in-line with the list so we don't need this activity. + finish(); + return; + } + + if (savedInstanceState == null) { + TestFragment trendsFragment = new TestFragment(); + getSupportFragmentManager() + .beginTransaction() + .add(android.R.id.content, trendsFragment) + .commit(); + } + } +} diff --git a/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/TestFragment.java b/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/TestFragment.java new file mode 100644 index 0000000..1ffa0f5 --- /dev/null +++ b/app/src/main/java/com/moxdroid/interview/tabviewpagerexample/python/TestFragment.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2016. Pritesh Patel, Toronto, Canada + */ + +package com.moxdroid.interview.tabviewpagerexample.python; + +import android.app.ProgressDialog; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.moxdroid.interview.tabviewpagerexample.R; + +import org.apache.http.client.methods.HttpGet; + +import java.net.URI; + + +public class TestFragment extends Fragment +{ + private static final String TAG = "AATestFragment"; + + // you'll want to call a REST service, but for basic network testing i use any url + //private static final String TEST_URL = "http://jsonplaceholder.typicode.com/comments"; + private static final String TEST_URL = "http://10.0.2.2:5000/todo/api/v1.0/tasks"; + private static final String ACTION_FOR_INTENT_CALLBACK = "OUTPUT_RESPONSE"; + + ProgressDialog progress; + private TextView ourTextView; + + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + ourTextView = (TextView)getActivity().findViewById(R.id.myTextView); + getContent(); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) + { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_test, container, false); + } + + + @Override + public void onResume() + { + super.onResume(); + getActivity().registerReceiver(receiver, new IntentFilter(ACTION_FOR_INTENT_CALLBACK)); + } + + @Override + public void onPause() + { + super.onPause(); + getActivity().unregisterReceiver(receiver); + } + + private void getContent() + { + // the request + try + { + HttpGet httpGet = new HttpGet(new URI(TEST_URL)); + RestTask task = new RestTask(getActivity(), ACTION_FOR_INTENT_CALLBACK); + task.execute(httpGet); + progress = ProgressDialog.show(getActivity(), "Getting Data ...", "Waiting For Results...", true); + } + catch (Exception e) + { + Log.e(TAG, e.getMessage()); + } + + } + + private BroadcastReceiver receiver = new BroadcastReceiver() + { + @Override + public void onReceive(Context context, Intent intent) + { + // clear the progress indicator + if (progress != null) + { + progress.dismiss(); + } + String response = intent.getStringExtra(RestTask.HTTP_RESPONSE); + ourTextView.setText(response); + Log.i(TAG, "RESPONSE = " + response); + // + // my old json code was here. this is where you will parse it. + // + } + }; +} diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml new file mode 100644 index 0000000..08c7efa --- /dev/null +++ b/app/src/main/res/layout/activity_test.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_test.xml b/app/src/main/res/layout/fragment_test.xml new file mode 100644 index 0000000..53afc34 --- /dev/null +++ b/app/src/main/res/layout/fragment_test.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/bottom-bar/build/generated/source/r/debug/android/support/design/R.java b/bottom-bar/build/generated/source/r/debug/android/support/design/R.java index aa86371..f0bdddf 100644 --- a/bottom-bar/build/generated/source/r/debug/android/support/design/R.java +++ b/bottom-bar/build/generated/source/r/debug/android/support/design/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/bottom-bar/build/generated/source/r/debug/android/support/v7/appcompat/R.java index 583c7bf..ff6bb7d 100644 --- a/bottom-bar/build/generated/source/r/debug/android/support/v7/appcompat/R.java +++ b/bottom-bar/build/generated/source/r/debug/android/support/v7/appcompat/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/generated/source/r/debug/android/support/v7/recyclerview/R.java b/bottom-bar/build/generated/source/r/debug/android/support/v7/recyclerview/R.java index 92501ba..af962a8 100644 --- a/bottom-bar/build/generated/source/r/debug/android/support/v7/recyclerview/R.java +++ b/bottom-bar/build/generated/source/r/debug/android/support/v7/recyclerview/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/generated/source/r/release/android/support/design/R.java b/bottom-bar/build/generated/source/r/release/android/support/design/R.java index aa86371..f0bdddf 100644 --- a/bottom-bar/build/generated/source/r/release/android/support/design/R.java +++ b/bottom-bar/build/generated/source/r/release/android/support/design/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/generated/source/r/release/android/support/v7/appcompat/R.java b/bottom-bar/build/generated/source/r/release/android/support/v7/appcompat/R.java index 583c7bf..ff6bb7d 100644 --- a/bottom-bar/build/generated/source/r/release/android/support/v7/appcompat/R.java +++ b/bottom-bar/build/generated/source/r/release/android/support/v7/appcompat/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/generated/source/r/release/android/support/v7/recyclerview/R.java b/bottom-bar/build/generated/source/r/release/android/support/v7/recyclerview/R.java index 92501ba..af962a8 100644 --- a/bottom-bar/build/generated/source/r/release/android/support/v7/recyclerview/R.java +++ b/bottom-bar/build/generated/source/r/release/android/support/v7/recyclerview/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json b/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json index 36fc25b..ca14abc 100644 --- a/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json +++ b/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json @@ -8,14 +8,24 @@ "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_list_selector_disabled_holo_dark.9.png" }, { +<<<<<<< HEAD "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_scrubber_track_mtrl_alpha.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_scrubber_track_mtrl_alpha.9.png" }, { +======= +>>>>>>> NewMaster "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00012.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00012.9.png" }, { +<<<<<<< HEAD +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_scrubber_track_mtrl_alpha.9.png", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_scrubber_track_mtrl_alpha.9.png" + }, + { +>>>>>>> NewMaster "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_menu_hardkey_panel_mtrl_mult.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_menu_hardkey_panel_mtrl_mult.9.png" }, @@ -28,14 +38,24 @@ "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_textfield_search_activated_mtrl_alpha.9.png" }, { +<<<<<<< HEAD "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png" }, { +======= +>>>>>>> NewMaster "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_textfield_search_default_mtrl_alpha.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_textfield_search_default_mtrl_alpha.9.png" }, { +<<<<<<< HEAD +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png" + }, + { +>>>>>>> NewMaster "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_list_pressed_holo_light.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_list_pressed_holo_light.9.png" }, diff --git a/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/layout.json b/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/layout.json index 6e6a9a0..85b975b 100644 --- a/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/layout.json +++ b/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/layout.json @@ -8,22 +8,37 @@ "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_screen_simple.xml" }, { +<<<<<<< HEAD "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_activity_chooser_view_list_item.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_activity_chooser_view_list_item.xml" }, { +======= +>>>>>>> NewMaster "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/notification_template_media.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/notification_template_media.xml" }, { +<<<<<<< HEAD "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_search_view.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_search_view.xml" +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_activity_chooser_view_list_item.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_activity_chooser_view_list_item.xml" +>>>>>>> NewMaster }, { "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_screen_simple_overlay_action_mode.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_screen_simple_overlay_action_mode.xml" }, { +<<<<<<< HEAD +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_search_view.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_search_view.xml" + }, + { +>>>>>>> NewMaster "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/design_navigation_item.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/design/24.1.1/res/layout/design_navigation_item.xml" }, @@ -44,16 +59,26 @@ "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_screen_toolbar.xml" }, { +<<<<<<< HEAD "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_fixed_tablet.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_fixed_tablet.xml" +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_shifting.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_shifting.xml" +>>>>>>> NewMaster }, { "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_dialog_title_material.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_dialog_title_material.xml" }, { +<<<<<<< HEAD "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_shifting.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_shifting.xml" +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_fixed_tablet.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_fixed_tablet.xml" +>>>>>>> NewMaster }, { "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/design_navigation_menu.xml", diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$anim.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$anim.class new file mode 100644 index 0000000..b6f406e Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$anim.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$attr.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$attr.class new file mode 100644 index 0000000..892960d Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$attr.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$bool.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$bool.class new file mode 100644 index 0000000..394e27c Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$bool.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$color.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$color.class new file mode 100644 index 0000000..7b59365 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$color.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$dimen.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$dimen.class new file mode 100644 index 0000000..eb04f7c Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$dimen.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$drawable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$drawable.class new file mode 100644 index 0000000..3886561 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$drawable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$id.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$id.class new file mode 100644 index 0000000..dadf045 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$id.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$integer.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$integer.class new file mode 100644 index 0000000..4487524 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$integer.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$layout.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$layout.class new file mode 100644 index 0000000..1d7498c Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$layout.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$string.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$string.class new file mode 100644 index 0000000..f94c1ad Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$string.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$style.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$style.class new file mode 100644 index 0000000..bdbc40b Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$style.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$styleable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$styleable.class new file mode 100644 index 0000000..2f3f0a7 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R$styleable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R.class new file mode 100644 index 0000000..0111521 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/design/R.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$anim.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$anim.class new file mode 100644 index 0000000..e84a3fd Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$anim.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$attr.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$attr.class new file mode 100644 index 0000000..c7d332c Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$attr.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$bool.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$bool.class new file mode 100644 index 0000000..7792990 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$bool.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$color.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$color.class new file mode 100644 index 0000000..8ed7700 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$color.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$dimen.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$dimen.class new file mode 100644 index 0000000..d73a007 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$dimen.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$drawable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$drawable.class new file mode 100644 index 0000000..2305147 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$drawable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$id.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$id.class new file mode 100644 index 0000000..83778dd Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$id.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$integer.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$integer.class new file mode 100644 index 0000000..6d39729 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$integer.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$layout.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$layout.class new file mode 100644 index 0000000..9a6f749 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$layout.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$string.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$string.class new file mode 100644 index 0000000..ab38a12 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$string.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$style.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$style.class new file mode 100644 index 0000000..606ac5c Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$style.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$styleable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$styleable.class new file mode 100644 index 0000000..cdfbae6 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R$styleable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R.class new file mode 100644 index 0000000..2c9d866 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/appcompat/R.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$attr.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$attr.class new file mode 100644 index 0000000..99a8ddf Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$attr.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$dimen.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$dimen.class new file mode 100644 index 0000000..7c80cfa Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$dimen.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$id.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$id.class new file mode 100644 index 0000000..eaacf2a Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$id.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$styleable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$styleable.class new file mode 100644 index 0000000..cf85df3 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R$styleable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R.class b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R.class new file mode 100644 index 0000000..a79eb8e Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/android/support/v7/recyclerview/R.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$anim.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$anim.class new file mode 100644 index 0000000..760e225 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$anim.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$attr.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$attr.class new file mode 100644 index 0000000..16fe0d7 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$attr.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$bool.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$bool.class new file mode 100644 index 0000000..7f9c370 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$bool.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$color.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$color.class new file mode 100644 index 0000000..f7de5ce Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$color.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$dimen.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$dimen.class new file mode 100644 index 0000000..b0f5cff Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$dimen.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$drawable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$drawable.class new file mode 100644 index 0000000..9145c90 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$drawable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$id.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$id.class new file mode 100644 index 0000000..8339eea Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$id.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$integer.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$integer.class new file mode 100644 index 0000000..5dc5ccd Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$integer.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$layout.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$layout.class new file mode 100644 index 0000000..dde5d25 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$layout.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$string.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$string.class new file mode 100644 index 0000000..b894c9f Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$string.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$style.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$style.class new file mode 100644 index 0000000..3d1c742 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$style.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$styleable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$styleable.class new file mode 100644 index 0000000..492f2e0 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R$styleable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R.class new file mode 100644 index 0000000..f5e7503 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/R.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/BuildConfig.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/BuildConfig.class new file mode 100644 index 0000000..853770f Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/BuildConfig.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$anim.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$anim.class new file mode 100644 index 0000000..90a02e0 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$anim.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$attr.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$attr.class new file mode 100644 index 0000000..fecb605 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$attr.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$bool.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$bool.class new file mode 100644 index 0000000..9e69be0 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$bool.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$color.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$color.class new file mode 100644 index 0000000..9a41cc2 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$color.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$dimen.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$dimen.class new file mode 100644 index 0000000..6a23696 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$dimen.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$drawable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$drawable.class new file mode 100644 index 0000000..e68b54d Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$drawable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$id.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$id.class new file mode 100644 index 0000000..54f3a5d Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$id.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$integer.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$integer.class new file mode 100644 index 0000000..8b27ab2 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$integer.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$layout.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$layout.class new file mode 100644 index 0000000..3224426 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$layout.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$string.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$string.class new file mode 100644 index 0000000..a69a9eb Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$string.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$style.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$style.class new file mode 100644 index 0000000..35058fd Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$style.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$styleable.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$styleable.class new file mode 100644 index 0000000..274ba6c Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R$styleable.class differ diff --git a/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R.class b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R.class new file mode 100644 index 0000000..ec248d9 Binary files /dev/null and b/bottom-bar/build/intermediates/classes/androidTest/debug/com/roughike/bottombar/test/R.class differ diff --git a/bottom-bar/build/intermediates/incremental-safeguard/androidTest/debug/tag.txt b/bottom-bar/build/intermediates/incremental-safeguard/androidTest/debug/tag.txt new file mode 100644 index 0000000..c01a13d --- /dev/null +++ b/bottom-bar/build/intermediates/incremental-safeguard/androidTest/debug/tag.txt @@ -0,0 +1 @@ +incremental task execution \ No newline at end of file diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..3150bac --- /dev/null +++ b/build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/custom_rules.xml b/custom_rules.xml new file mode 100644 index 0000000..08bb4ba --- /dev/null +++ b/custom_rules.xml @@ -0,0 +1,65 @@ + + + + + + + + + + Setting app version code to '${app.version.code}' + + + + + + + + + + + + + + Setting app version name to '${app.version.major}.${app.version.minor} (${environment})' + + + + + Setting app version name to '${app.version.major}.${app.version.minor}' + + + + + + + + + + + + + + Setting ${environment} configuration... + + + + + Setting debug configuration... + + + + \ No newline at end of file diff --git a/proguard-project.txt b/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/project.properties b/project.properties new file mode 100644 index 0000000..7ce6866 --- /dev/null +++ b/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-24 diff --git a/vitamio/build.xml b/vitamio/build.xml new file mode 100644 index 0000000..bf64ea0 --- /dev/null +++ b/vitamio/build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$color.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$color.class new file mode 100644 index 0000000..fc53a2b Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$color.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$drawable.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$drawable.class new file mode 100644 index 0000000..85de4e0 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$drawable.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$id.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$id.class new file mode 100644 index 0000000..4f89f6d Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$id.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$layout.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$layout.class new file mode 100644 index 0000000..0e4eb9f Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$layout.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$raw.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$raw.class new file mode 100644 index 0000000..39200bd Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$raw.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$string.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$string.class new file mode 100644 index 0000000..f59ee18 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$string.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$style.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$style.class new file mode 100644 index 0000000..f75afc0 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R$style.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R.class new file mode 100644 index 0000000..a0b309b Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/R.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/BuildConfig.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/BuildConfig.class new file mode 100644 index 0000000..c1fb7c6 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/BuildConfig.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$attr.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$attr.class new file mode 100644 index 0000000..3be63a6 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$attr.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$color.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$color.class new file mode 100644 index 0000000..6db4329 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$color.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$drawable.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$drawable.class new file mode 100644 index 0000000..1f9e5a9 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$drawable.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$id.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$id.class new file mode 100644 index 0000000..48c3ec8 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$id.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$layout.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$layout.class new file mode 100644 index 0000000..08ffad9 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$layout.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$raw.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$raw.class new file mode 100644 index 0000000..d2af182 Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$raw.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$string.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$string.class new file mode 100644 index 0000000..5f563af Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$string.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$style.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$style.class new file mode 100644 index 0000000..23a080d Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R$style.class differ diff --git a/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R.class b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R.class new file mode 100644 index 0000000..c6675dc Binary files /dev/null and b/vitamio/build/intermediates/classes/androidTest/debug/io/vov/vitamio/test/R.class differ diff --git a/vitamio/build/intermediates/incremental-safeguard/androidTest/debug/tag.txt b/vitamio/build/intermediates/incremental-safeguard/androidTest/debug/tag.txt new file mode 100644 index 0000000..c01a13d --- /dev/null +++ b/vitamio/build/intermediates/incremental-safeguard/androidTest/debug/tag.txt @@ -0,0 +1 @@ +incremental task execution \ No newline at end of file diff --git a/vitamio/local.properties b/vitamio/local.properties new file mode 100644 index 0000000..0c906d3 --- /dev/null +++ b/vitamio/local.properties @@ -0,0 +1,10 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +# location of the SDK. This is only used by Ant +# For customization when using a Version Control System, please read the +# header note. +sdk.dir=/Users/pritesh.patel/Library/Android/sdk diff --git a/vitamio/proguard-project.txt b/vitamio/proguard-project.txt index 89ec639..f2fe155 100755 --- a/vitamio/proguard-project.txt +++ b/vitamio/proguard-project.txt @@ -18,12 +18,3 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} - -# For Vitamio classes --keep public class io.vov.vitamio.MediaPlayer { *; } --keep public class io.vov.vitamio.IMediaScannerService { *; } --keep public class io.vov.vitamio.MediaScanner { *; } --keep public class io.vov.vitamio.MediaScannerClient { *; } --keep public class io.vov.vitamio.VitamioLicense { *; } --keep public class io.vov.vitamio.Vitamio { *; } --keep public class io.vov.vitamio.MediaMetadataRetriever { *; } diff --git a/vitamio/project.properties b/vitamio/project.properties index 91d2b02..34c8d58 100755 --- a/vitamio/project.properties +++ b/vitamio/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-19 +target=android-24 android.library=true