diff --git a/.gitmodules b/.gitmodules
index 71bd337..5f8800f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
[submodule "viewpagerindicator"]
path = viewpagerindicator
url = git://github.com/JakeWharton/Android-ViewPagerIndicator.git
+[submodule "submodules/viewpagerindicator"]
+ path = submodules/viewpagerindicator
+ url = git://github.com/JakeWharton/Android-ViewPagerIndicator.git
diff --git a/app/project.properties b/app/project.properties
deleted file mode 100644
index 84b6544..0000000
--- a/app/project.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-18
-android.library.reference.1=../submodules/facebook-android-sdk/facebook
-android.library.reference.2=../submodules/Android-Feather
-android.library.reference.3=../submodules/HoloEverywhere/library
-android.library.reference.4=../submodules/HoloEverywhere/addons/preferences
-android.library.reference.5=../submodules/HoloEverywhere/addons/slider
-android.library.reference.6=../submodules/google-play-services_lib
diff --git a/app/res/drawable-hdpi/slide_1_image.png b/app/res/drawable-hdpi/slide_1_image.png
new file mode 100644
index 0000000..51f63d0
Binary files /dev/null and b/app/res/drawable-hdpi/slide_1_image.png differ
diff --git a/app/res/drawable-hdpi/slide_2_image.png b/app/res/drawable-hdpi/slide_2_image.png
new file mode 100644
index 0000000..1447515
Binary files /dev/null and b/app/res/drawable-hdpi/slide_2_image.png differ
diff --git a/app/res/drawable-hdpi/slide_3_image.png b/app/res/drawable-hdpi/slide_3_image.png
new file mode 100644
index 0000000..9986bef
Binary files /dev/null and b/app/res/drawable-hdpi/slide_3_image.png differ
diff --git a/app/res/drawable/custom_border_intro.xml b/app/res/drawable/custom_border_intro.xml
new file mode 100644
index 0000000..395fd90
--- /dev/null
+++ b/app/res/drawable/custom_border_intro.xml
@@ -0,0 +1,24 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/res/layout/activity_intro.xml b/app/res/layout/activity_intro.xml
new file mode 100644
index 0000000..f6539d6
--- /dev/null
+++ b/app/res/layout/activity_intro.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/res/values-pt/strings.xml b/app/res/values-pt/strings.xml
index 0dfd06d..d7257e5 100644
--- a/app/res/values-pt/strings.xml
+++ b/app/res/values-pt/strings.xml
@@ -5,6 +5,9 @@
Carregando…
Tire foto
+
+ Pular
+
Atualizar
Preferências
diff --git a/app/res/values-sw600dp/dimens.xml b/app/res/values-sw600dp/dimens.xml
new file mode 100644
index 0000000..44f01db
--- /dev/null
+++ b/app/res/values-sw600dp/dimens.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
diff --git a/app/res/values-sw720dp-land/dimens.xml b/app/res/values-sw720dp-land/dimens.xml
new file mode 100644
index 0000000..61e3fa8
--- /dev/null
+++ b/app/res/values-sw720dp-land/dimens.xml
@@ -0,0 +1,9 @@
+
+
+
+ 128dp
+
+
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
index b5ea59d..52e67be 100644
--- a/app/res/values/dimens.xml
+++ b/app/res/values/dimens.xml
@@ -29,4 +29,7 @@
- 200dip
+ 16dp
+ 16dp
+
\ No newline at end of file
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index 7ff3679..72355b2 100644
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -5,6 +5,12 @@
Loading…
Take Photo
+
+ Skip
+ One spot for your company\'s photos and videos
+ Collaborate with colleagues and clients
+ Securely and painlessly organize and share
+
Take a photo
Refresh
@@ -311,5 +317,8 @@
Thank you for subscribing to premium!
You are already a premium member and don\'t need to upgrade!
+ TesteActivity
+ Settings
+ Hello world!
\ No newline at end of file
diff --git a/app/src/com/trovebox/android/app/ImageFragment.java b/app/src/com/trovebox/android/app/ImageFragment.java
new file mode 100644
index 0000000..46e559e
--- /dev/null
+++ b/app/src/com/trovebox/android/app/ImageFragment.java
@@ -0,0 +1,78 @@
+package com.trovebox.android.app;
+
+import com.trovebox.android.app.R;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.TextView;
+
+public final class ImageFragment extends Fragment {
+ int imageResourceId;
+ int contentResourceId;
+ private static final String KEY_CONTENT = "ImageFragment:imageResourceId";
+ int mNum;
+ public static Fragment newInstance(int i, int content) {
+ ImageFragment f = new ImageFragment();
+ // Supply num input as an argument.
+ // Bundle args = new Bundle();
+ //args.putInt(KEY_CONTENT, i);
+ //f.setArguments(args);
+ f.imageResourceId = i;
+ f.contentResourceId = content;
+ //imageResourceId = i;
+ return f;
+
+ }
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ if ((savedInstanceState != null) && savedInstanceState.containsKey(KEY_CONTENT)) {
+ imageResourceId = savedInstanceState.getInt(KEY_CONTENT);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+
+ TextView text = new TextView(getActivity());
+ text.setGravity(Gravity.CENTER);
+ // text.setText("teste");
+ text.setText(getString(contentResourceId));
+ //int scale = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+ // (float) 123.4, getResources().getDisplayMetrics());
+ // int scale = (int)getResources().getDisplayMetrics().density;
+ // Log.i("MyActivity", "MyClass.getView() Ñ get item number " + getResources().getDisplayMetrics().density);
+ text.setTextSize(12 * getResources().getDisplayMetrics().density);
+ text.setPadding(10, 10, 10, 10);
+
+
+ ImageView image = new ImageView(getActivity());
+ image.setImageResource(imageResourceId);
+
+ LinearLayout layout = new LinearLayout(getActivity());
+ layout.setOrientation(LinearLayout.VERTICAL);
+ layout.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
+ LayoutParams.FILL_PARENT));
+
+ layout.setGravity(Gravity.CENTER);
+ layout.addView(image);
+ layout.addView(text);
+
+ return layout;
+ }
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putInt(KEY_CONTENT, imageResourceId);
+ }
+
+}
diff --git a/app/src/com/trovebox/android/app/ImageFragmentAdapter.java b/app/src/com/trovebox/android/app/ImageFragmentAdapter.java
new file mode 100644
index 0000000..bddc613
--- /dev/null
+++ b/app/src/com/trovebox/android/app/ImageFragmentAdapter.java
@@ -0,0 +1,38 @@
+package com.trovebox.android.app;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+public class ImageFragmentAdapter extends FragmentPagerAdapter {
+ private static final int[] Images = new int[] {R.drawable.slide_1_image, R.drawable.slide_2_image, R.drawable.slide_3_image};
+ private static final int[] Content = new int[] {R.string.slide_1_text, R.string.slide_2_text,R.string.slide_3_text};
+ //private static final int[] Images = new int[]
+
+ private int mCount = Images.length;
+
+ public ImageFragmentAdapter(FragmentManager fm) {
+ super(fm);
+
+
+ }
+ @Override
+ public Fragment getItem(int position) {
+
+ return ImageFragment.newInstance(Images[position], Content[position]);
+ }
+
+ @Override
+ public int getCount() {
+ return mCount;
+ }
+
+ public void setCount(int count) {
+ if (count > 0 && count <= 10) {
+ mCount = count;
+ notifyDataSetChanged();
+ }
+ }
+
+
+}
diff --git a/app/src/com/trovebox/android/app/IntroActivity.java b/app/src/com/trovebox/android/app/IntroActivity.java
new file mode 100644
index 0000000..733a3f0
--- /dev/null
+++ b/app/src/com/trovebox/android/app/IntroActivity.java
@@ -0,0 +1,132 @@
+
+package com.trovebox.android.app;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.view.ViewPager;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.PageIndicator;
+
+public class IntroActivity extends FragmentActivity
+{
+
+ ImageFragmentAdapter mAdapter;
+ ViewPager mPager;
+ PageIndicator mIndicator;
+ int mPosition;
+ float mPositionOffset;
+ int mPositionOffsetPixels;
+ int mState;
+
+ float x1, x2;
+ float y1, y2;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_intro);
+ // Set the pager with an adapter
+ mPager = (ViewPager) findViewById(R.id.pager);
+
+ mAdapter = new ImageFragmentAdapter(getSupportFragmentManager());
+ mPager.setAdapter(mAdapter);
+ mPager.setOnTouchListener(new View.OnTouchListener() {
+
+ @Override
+ public boolean onTouch(View v, MotionEvent touchEvent) {
+ int action = touchEvent.getAction();
+ switch (action) {
+ case MotionEvent.ACTION_DOWN:
+ {
+ x1 = touchEvent.getX();
+ y1 = touchEvent.getY();
+ break;
+ }
+ case MotionEvent.ACTION_UP:
+ {
+ x2 = touchEvent.getX();
+ y2 = touchEvent.getY();
+
+ // if left to right sweep event on screen
+ if (x1 > x2 && mPosition + 1 == mAdapter.getCount())
+ skipIntro(null);
+ break;
+ }
+ }
+ return false;
+ }
+ });
+ mIndicator = (CirclePageIndicator) findViewById(R.id.indicator);
+ mIndicator.setViewPager(mPager);
+
+ mIndicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+ mPosition = position;
+ mPositionOffset = positionOffset;
+ mPositionOffsetPixels = positionOffsetPixels;
+
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int state) {
+ mState = state;
+ }
+
+ @Override
+ public void onPageSelected(int arg0) {
+ }
+ });
+
+ }
+ @Override
+ protected void onResume() {
+ super.onResume();
+ Log.i("DD", "onResume()");
+//
+ SharedPreferences sharedPrefs = this.getSharedPreferences(
+ "skip_intro", this.MODE_PRIVATE);
+ Log.i("DD", "" + (sharedPrefs.getInt("clickedSkip", 0)));
+
+ if(sharedPrefs.getInt("clickedSkip", 0) == 1)
+ {
+ startActivity(new Intent(this, AccountActivity.class));
+ finish();
+ }
+
+ // startActivity(new Intent(this, MainActivity.class));
+
+
+ }
+
+ public void skipIntro(View v)
+ {
+
+
+ SharedPreferences sharedPrefs = this.getSharedPreferences(
+ "skip_intro", this.MODE_PRIVATE);
+ Log.i("DD", "" + (sharedPrefs.getInt("clickedSkip", 0)));
+
+ if(sharedPrefs.getInt("clickedSkip", 0) == 0)
+ {
+ SharedPreferences.Editor editor = sharedPrefs.edit();
+ editor.putInt("clickedSkip", 1);
+ editor.commit();
+
+ }
+ Log.i("DD", "" + (sharedPrefs.getInt("clickedSkip", 0)));
+ startActivity(new Intent(this, AccountActivity.class));
+ finish();
+
+ }
+}
diff --git a/app/src/com/trovebox/android/app/MainActivity.java b/app/src/com/trovebox/android/app/MainActivity.java
index 4869201..e324dae 100644
--- a/app/src/com/trovebox/android/app/MainActivity.java
+++ b/app/src/com/trovebox/android/app/MainActivity.java
@@ -12,10 +12,12 @@ import org.holoeverywhere.app.Activity;
import org.holoeverywhere.app.Activity.Addons;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.Fragment;
+import android.view.KeyEvent;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.view.Menu;
@@ -179,7 +181,7 @@ public class MainActivity extends CommonActivity implements LoadingControl, Gall
super.onSaveInstanceState(outState);
instanceSaved = true;
}
-
+
@Override
protected void onResume()
{
@@ -190,7 +192,14 @@ public class MainActivity extends CommonActivity implements LoadingControl, Gall
if (!Preferences.isLoggedIn(this))
{
// startActivity(new Intent(this, SetupActivity.class));
- startActivity(new Intent(this, AccountActivity.class));
+ // startActivity(new Intent(this, AccountActivity.class));
+ SharedPreferences sharedPrefs = this.getSharedPreferences(
+ "skip_intro", this.MODE_PRIVATE);
+ if (sharedPrefs.getInt("clickedSkip", 0) == 0)
+ startActivity(new Intent(this, IntroActivity.class));
+ else
+ startActivity(new Intent(this, AccountActivity.class));
+
finish();
}
}
diff --git a/app/src/com/trovebox/android/app/SplashActivity.java b/app/src/com/trovebox/android/app/SplashActivity.java
index 687d326..14f9422 100644
--- a/app/src/com/trovebox/android/app/SplashActivity.java
+++ b/app/src/com/trovebox/android/app/SplashActivity.java
@@ -73,7 +73,7 @@ public class SplashActivity extends Activity {
// Go to Main screen
Intent i = Preferences.isLoggedIn() ?
new Intent(SplashActivity.this, MainActivity.class) :
- new Intent(SplashActivity.this, AccountActivity.class);
+ new Intent(SplashActivity.this, IntroActivity.class);
startActivity(i);
finish();
}
diff --git a/app/src/com/trovebox/android/app/net/account/IAccountTroveboxApiFactory.java b/app/src/com/trovebox/android/app/net/account/IAccountTroveboxApiFactory.java
index 3240445..d83d254 100644
--- a/app/src/com/trovebox/android/app/net/account/IAccountTroveboxApiFactory.java
+++ b/app/src/com/trovebox/android/app/net/account/IAccountTroveboxApiFactory.java
@@ -28,6 +28,6 @@ public class IAccountTroveboxApiFactory {
*/
public static IAccountTroveboxApi getApi(Context context)
{
- return new AccountTroveboxApi(context);
+ return new FakeAccountTroveboxApi(context);
}
}
diff --git a/viewpagerindicator b/submodules/viewpagerindicator
similarity index 100%
rename from viewpagerindicator
rename to submodules/viewpagerindicator