diff --git a/.gitignore b/.gitignore
index 00d1bdd..7842fc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
test/ant.properties
.DS_Store
-app/src/me/openphoto/android/app/net/account/AccountOpenPhotoApi.java
\ No newline at end of file
+app/src/me/openphoto/android/app/net/account/AccountOpenPhotoApi.java
+etc/
+
+
diff --git a/.gitmodules b/.gitmodules
index 5f8800f..7885bfd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
[submodule "submodules/PhotoView"]
path = submodules/PhotoView
url = https://github.com/chrisbanes/PhotoView.git
-[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/AndroidManifest.xml b/app/AndroidManifest.xml
index e38bc63..6f81b0b 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -25,12 +25,12 @@
@@ -40,7 +40,7 @@
@@ -53,7 +53,7 @@
@@ -66,7 +66,7 @@
@@ -79,7 +79,7 @@
@@ -97,26 +97,31 @@
-
+
+
+
+
+
@@ -144,17 +149,17 @@
-
+
-
+
@@ -163,6 +168,8 @@
android:authorities="com.trovebox.aviary.launcher.HiResProvider"
android:exported="false" >
+
+
\ No newline at end of file
diff --git a/app/project.properties b/app/project.properties
new file mode 100644
index 0000000..2836686
--- /dev/null
+++ b/app/project.properties
@@ -0,0 +1,9 @@
+# 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
+android.library.reference.7=../submodules/viewpagerindicator/library
diff --git a/app/res/drawable-hdpi/slide_1_image.9.png b/app/res/drawable-hdpi/slide_1_image.9.png
new file mode 100755
index 0000000..763fe48
Binary files /dev/null and b/app/res/drawable-hdpi/slide_1_image.9.png differ
diff --git a/app/res/drawable-hdpi/slide_1_image.png b/app/res/drawable-hdpi/slide_1_image.png
deleted file mode 100644
index 51f63d0..0000000
Binary files a/app/res/drawable-hdpi/slide_1_image.png and /dev/null differ
diff --git a/app/res/drawable-hdpi/slide_2_image.9.png b/app/res/drawable-hdpi/slide_2_image.9.png
new file mode 100755
index 0000000..9cf93db
Binary files /dev/null and b/app/res/drawable-hdpi/slide_2_image.9.png differ
diff --git a/app/res/drawable-hdpi/slide_2_image.png b/app/res/drawable-hdpi/slide_2_image.png
deleted file mode 100644
index 1447515..0000000
Binary files a/app/res/drawable-hdpi/slide_2_image.png and /dev/null differ
diff --git a/app/res/drawable-hdpi/slide_3_image.9.png b/app/res/drawable-hdpi/slide_3_image.9.png
new file mode 100755
index 0000000..dcddf80
Binary files /dev/null and b/app/res/drawable-hdpi/slide_3_image.9.png differ
diff --git a/app/res/drawable-hdpi/slide_3_image.png b/app/res/drawable-hdpi/slide_3_image.png
deleted file mode 100644
index 9986bef..0000000
Binary files a/app/res/drawable-hdpi/slide_3_image.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/slide_1_image.9.png b/app/res/drawable-mdpi/slide_1_image.9.png
new file mode 100755
index 0000000..03bd0b6
Binary files /dev/null and b/app/res/drawable-mdpi/slide_1_image.9.png differ
diff --git a/app/res/drawable-mdpi/slide_2_image.9.png b/app/res/drawable-mdpi/slide_2_image.9.png
new file mode 100755
index 0000000..cb1d21f
Binary files /dev/null and b/app/res/drawable-mdpi/slide_2_image.9.png differ
diff --git a/app/res/drawable-mdpi/slide_3_image.9.png b/app/res/drawable-mdpi/slide_3_image.9.png
new file mode 100755
index 0000000..649f48d
Binary files /dev/null and b/app/res/drawable-mdpi/slide_3_image.9.png differ
diff --git a/app/res/drawable-xhdpi/slide_1_image.9.png b/app/res/drawable-xhdpi/slide_1_image.9.png
new file mode 100755
index 0000000..3b9948c
Binary files /dev/null and b/app/res/drawable-xhdpi/slide_1_image.9.png differ
diff --git a/app/res/drawable-xhdpi/slide_2_image.9.png b/app/res/drawable-xhdpi/slide_2_image.9.png
new file mode 100755
index 0000000..a17ad86
Binary files /dev/null and b/app/res/drawable-xhdpi/slide_2_image.9.png differ
diff --git a/app/res/drawable-xhdpi/slide_3_image.9.png b/app/res/drawable-xhdpi/slide_3_image.9.png
new file mode 100755
index 0000000..3348e22
Binary files /dev/null and b/app/res/drawable-xhdpi/slide_3_image.9.png differ
diff --git a/app/res/drawable/custom_border_intro.xml b/app/res/drawable/custom_border_intro.xml
deleted file mode 100644
index 395fd90..0000000
--- a/app/res/drawable/custom_border_intro.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/res/values-sw600dp/dimens.xml b/app/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 44f01db..0000000
--- a/app/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/app/res/values-sw720dp-land/dimens.xml b/app/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index 61e3fa8..0000000
--- a/app/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- 128dp
-
-
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
index 52e67be..b526e05 100644
--- a/app/res/values/dimens.xml
+++ b/app/res/values/dimens.xml
@@ -32,4 +32,5 @@
16dp
16dp
+ 16dp
\ No newline at end of file
diff --git a/app/res/values/settings.xml b/app/res/values/settings.xml
index 8d9c545..597c01a 100644
--- a/app/res/values/settings.xml
+++ b/app/res/values/settings.xml
@@ -50,5 +50,7 @@
- publish_stream
- photo_upload
-
+
+
+ setting_intro_skip
\ No newline at end of file
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index 72355b2..99a4327 100644
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -317,7 +317,7 @@
Thank you for subscribing to premium!
You are already a premium member and don\'t need to upgrade!
- TesteActivity
+
Settings
Hello world!
diff --git a/app/src/com/trovebox/android/app/ImageFragment.java b/app/src/com/trovebox/android/app/ImageFragment.java
index 46e559e..9037c09 100644
--- a/app/src/com/trovebox/android/app/ImageFragment.java
+++ b/app/src/com/trovebox/android/app/ImageFragment.java
@@ -1,9 +1,13 @@
+
package com.trovebox.android.app;
import com.trovebox.android.app.R;
+import com.trovebox.android.app.common.CommonFragment;
+import com.trovebox.android.app.util.CommonUtils;
import android.os.Bundle;
import android.support.v4.app.Fragment;
+import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -13,66 +17,62 @@ 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;
+public final class ImageFragment extends com.trovebox.android.app.common.CommonFragment {
+ int imageResourceId;
+ int contentResourceId;
+ private static final String KEY_CONTENT = "ImageFragment:imageResourceId";
+ int mNum;
- }
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public static Fragment newInstance(int i, int content) {
+ ImageFragment f = new ImageFragment();
+ f.imageResourceId = i;
+ f.contentResourceId = content;
+ 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(org.holoeverywhere.LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
-
- TextView text = new TextView(getActivity());
+ 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);
+ text.setTextSize(10 * getResources().getDisplayMetrics().density);
+ int padding = (int) getResources().getDimensionPixelSize(R.dimen.activity_intro_margin);
+ text.setPadding(padding, padding, padding, padding);
- LinearLayout layout = new LinearLayout(getActivity());
- layout.setOrientation(LinearLayout.VERTICAL);
- layout.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
- LayoutParams.FILL_PARENT));
+ ImageView image = new ImageView(getActivity());
+ image.setImageResource(imageResourceId);
- layout.setGravity(Gravity.CENTER);
- layout.addView(image);
- layout.addView(text);
+ 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);
+ }
- 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/IntroActivity.java b/app/src/com/trovebox/android/app/IntroActivity.java
index 733a3f0..9f922af 100644
--- a/app/src/com/trovebox/android/app/IntroActivity.java
+++ b/app/src/com/trovebox/android/app/IntroActivity.java
@@ -4,6 +4,8 @@ package com.trovebox.android.app;
import java.sql.Timestamp;
import java.util.Date;
+import org.holoeverywhere.HoloEverywhere;
+
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
@@ -17,7 +19,7 @@ import android.view.View;
import com.viewpagerindicator.CirclePageIndicator;
import com.viewpagerindicator.PageIndicator;
-public class IntroActivity extends FragmentActivity
+public class IntroActivity extends org.holoeverywhere.app.Activity
{
ImageFragmentAdapter mAdapter;
@@ -92,39 +94,16 @@ public class IntroActivity extends FragmentActivity
@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)
+ if(Preferences.getSkipButton() == true)
{
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)));
+ if(Preferences.getSkipButton() == false)
+ Preferences.setSkipButton(true);
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 e324dae..344ca4c 100644
--- a/app/src/com/trovebox/android/app/MainActivity.java
+++ b/app/src/com/trovebox/android/app/MainActivity.java
@@ -193,9 +193,7 @@ public class MainActivity extends CommonActivity implements LoadingControl, Gall
{
// startActivity(new Intent(this, SetupActivity.class));
// startActivity(new Intent(this, AccountActivity.class));
- SharedPreferences sharedPrefs = this.getSharedPreferences(
- "skip_intro", this.MODE_PRIVATE);
- if (sharedPrefs.getInt("clickedSkip", 0) == 0)
+ if(Preferences.getSkipButton() == false)
startActivity(new Intent(this, IntroActivity.class));
else
startActivity(new Intent(this, AccountActivity.class));
diff --git a/app/src/com/trovebox/android/app/Preferences.java b/app/src/com/trovebox/android/app/Preferences.java
index 1c2242b..9723b06 100644
--- a/app/src/com/trovebox/android/app/Preferences.java
+++ b/app/src/com/trovebox/android/app/Preferences.java
@@ -503,4 +503,19 @@ public class Preferences {
public static ITroveboxApi getApi(Context context) {
return TroveboxApi.createInstance(context);
}
+
+ public static void setSkipButton(boolean b)
+ {
+ getLimitsSharedPreferences()
+ .edit()
+ .putBoolean(CommonUtils.getStringResource(R.string.setting_intro_skip),
+ b)
+ .commit();
+
+ }
+ public static boolean getSkipButton()
+ {
+ return getLimitsSharedPreferences()
+ .getBoolean(CommonUtils.getStringResource(R.string.setting_intro_skip), false);
+ }
}
diff --git a/submodules/Android-Feather/.settings/org.eclipse.jdt.core.prefs b/submodules/Android-Feather/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b080d2d
--- /dev/null
+++ b/submodules/Android-Feather/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/submodules/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs b/submodules/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b080d2d
--- /dev/null
+++ b/submodules/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6