#279 - updated content after Eugene's comments.

.gitignore

@@ -1,3 +1,6 @@
 test/ant.properties
 .DS_Store
-app/src/me/openphoto/android/app/net/account/AccountOpenPhotoApi.java
+app/src/me/openphoto/android/app/net/account/AccountOpenPhotoApi.java
+etc/
+
+

.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

app/AndroidManifest.xml

@@ -25,12 +25,12 @@
     <uses-permission android:name="com.android.vending.BILLING" />
 
     <application
-        android:name=".TroveboxApplication"
+        android:name="com.trovebox.android.app.TroveboxApplication"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:theme="@style/Theme.Trovebox.Light" >
         <activity
-            android:name=".SplashActivity"
+            android:name="com.trovebox.android.app.SplashActivity"
             android:launchMode="singleTask"
             android:theme="@style/Theme.Trovebox.Login" >
             <intent-filter>
@@ -40,7 +40,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SetupActivity"
+            android:name="com.trovebox.android.app.SetupActivity"
             android:launchMode="singleTask"
             android:theme="@style/Theme.Trovebox.Login" >
             <intent-filter>
@@ -53,7 +53,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name="com.trovebox.android.app.MainActivity"
             android:launchMode="singleTask"
             android:logo="@drawable/actionbar_logo" >
             <intent-filter>
@@ -66,7 +66,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".PhotoDetailsActivity"
+            android:name="com.trovebox.android.app.PhotoDetailsActivity"
             android:launchMode="singleTask"
             android:theme="@style/Theme.Trovebox.TransparentActionBar" >
             <intent-filter>
@@ -79,7 +79,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".UploadActivity"
+            android:name="com.trovebox.android.app.UploadActivity"
             android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -97,26 +97,31 @@
                 <data android:scheme="trovebox-t3" />
             </intent-filter>
         </activity>
-        <activity android:name=".SettingsActivity" />
+        <activity android:name="com.trovebox.android.app.SettingsActivity" />
         <activity
-            android:name=".AccountLogin"
+            android:name="com.trovebox.android.app.AccountLogin"
             android:theme="@style/Theme.Trovebox.Login" />
+          <activity
+            android:name="com.trovebox.android.app.IntroActivity" android:configChanges="keyboardHidden|orientation|screenSize"  android:launchMode="singleTask"/>
+       
         <activity
-            android:name=".AccountActivity"
+            android:name="com.trovebox.android.app.AccountActivity"
             android:theme="@style/Theme.Trovebox.Login" />
+        
+        
         <activity
-            android:name=".SelectAccountActivity"
+            android:name="com.trovebox.android.app.SelectAccountActivity"
             android:label="@string/select_trovebox_account"
             android:launchMode="singleTask" >
         </activity>
         <activity
-            android:name=".SelectTagsActivity"
+            android:name="com.trovebox.android.app.SelectTagsActivity"
             android:configChanges="orientation"
             android:label="@string/title_activity_select_tags"
             android:theme="@style/Theme.Trovebox.DialogActivity.Light" >
         </activity>
         <activity
-            android:name=".SelectAlbumsActivity"
+            android:name="com.trovebox.android.app.SelectAlbumsActivity"
             android:configChanges="orientation"
             android:label="@string/title_activity_select_albums"
             android:theme="@style/Theme.Trovebox.DialogActivity.Light" >
@@ -144,17 +149,17 @@
 
         <!-- AutoUpload things -->
         <!-- Stuff for auto uploading photos -->
-        <receiver android:name=".receiver.BootCompletedReceiver" >
+        <receiver android:name="com.trovebox.android.app.receiver.BootCompletedReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" >
                 </action>
             </intent-filter>
         </receiver>
 
-        <service android:name=".service.UploaderService" />
+        <service android:name="com.trovebox.android.app.service.UploaderService" />
 
         <provider
-            android:name=".provider.UploadsProvider"
+            android:name="com.trovebox.android.app.provider.UploadsProvider"
             android:authorities="com.trovebox.android.app" />
         <!-- Required for the hi-res image processing -->
         <!-- authorities can have the value you prefer -->
@@ -163,6 +168,8 @@
             android:authorities="com.trovebox.aviary.launcher.HiResProvider"
             android:exported="false" >
         </provider>
+
+
     </application>
 
 </manifest>

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

app/res/drawable/custom_border_intro.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item> 
-    <shape android:shape="rectangle">
-      <solid android:color="#FF3b2414" /> 
-    </shape>
-  </item>   
-    <item android:bottom="20dp"  android:top="20dp" >  
-     <shape android:shape="rectangle"> 
-      <solid android:color="@android:color/white" />
-    </shape>
-   </item>    
- </layer-list>
- <!-- transparent 
- <?xml version="1.0" encoding="utf-8"?>
- <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-   <item  android:top="0dp" android:left="-20dp" android:right="-20dp" 
-        android:bottom="0dp"> 
-    <shape android:shape="rectangle">
-     <stroke android:width="20dp" android:color="#FF3b2414" />
-    </shape>
-   </item>  
- </layer-list> 
- --> 

app/res/values-sw600dp/dimens.xml

@@ -1,8 +0,0 @@
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw600dp devices (e.g. 7" tablets) here.
-    -->
-
-</resources>

app/res/values-sw720dp-land/dimens.xml

@@ -1,9 +0,0 @@
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    -->
-    <dimen name="activity_horizontal_margin">128dp</dimen>
-
-</resources>

app/res/values/dimens.xml

@@ -32,4 +32,5 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
+    <dimen name="activity_intro_margin">16dp</dimen>
 </resources>

app/res/values/settings.xml

@@ -50,5 +50,7 @@
         <item>publish_stream</item>
         <item>photo_upload</item>
     </string-array>
-
+    
+    <!--  Intro -->
+	<string name="setting_intro_skip">setting_intro_skip</string>
 </resources>

app/res/values/strings.xml

@@ -317,7 +317,7 @@
     <!-- In-App Billing -->
     <string name="iabMonthlySubscriptionSuccess">Thank you for subscribing to premium!</string>
     <string name="iabNoNeedToUpgrade">You are already a premium member and don\'t need to upgrade!</string>
-    <string name="title_activity_teste">TesteActivity</string>
+    
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
 

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 {
+public final class ImageFragment extends com.trovebox.android.app.common.CommonFragment {
-	int  imageResourceId;
+    int imageResourceId;
-	int  contentResourceId;
+    int contentResourceId;
-	private static final String KEY_CONTENT = "ImageFragment:imageResourceId";
+    private static final String KEY_CONTENT = "ImageFragment:imageResourceId";
-	int mNum;
+    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 static Fragment newInstance(int i, int content) {
-	@Override
+        ImageFragment f = new ImageFragment();
-	public void onCreate(Bundle savedInstanceState) {
+        f.imageResourceId = i;
-		super.onCreate(savedInstanceState);
+        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
+        TextView text = new TextView(getActivity());
-	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, 
+        text.setTextSize(10 * getResources().getDisplayMetrics().density);
-         //       (float) 123.4, getResources().getDisplayMetrics());
+        int padding = (int) getResources().getDimensionPixelSize(R.dimen.activity_intro_margin);
-      //  int scale = (int)getResources().getDisplayMetrics().density;
+        text.setPadding(padding, padding, padding, padding);
-       // 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());
+        ImageView image = new ImageView(getActivity());
-		layout.setOrientation(LinearLayout.VERTICAL);
+        image.setImageResource(imageResourceId);
-		layout.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
-				LayoutParams.FILL_PARENT));
 
-		layout.setGravity(Gravity.CENTER);
+        LinearLayout layout = new LinearLayout(getActivity());
-		layout.addView(image);
+        layout.setOrientation(LinearLayout.VERTICAL);
-		layout.addView(text);
+        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);
-	    }
-	 
 }

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()");
+        if(Preferences.getSkipButton() == true)
-//        
-        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)
     {
-        
+        if(Preferences.getSkipButton() == false)
-          
+            Preferences.setSkipButton(true);
-        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();
         

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(
+            if(Preferences.getSkipButton() == false)
-                    "skip_intro", this.MODE_PRIVATE);
-            if (sharedPrefs.getInt("clickedSkip", 0) == 0)
                 startActivity(new Intent(this, IntroActivity.class));
             else
                 startActivity(new Intent(this, AccountActivity.class));

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);
+    }
 }

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

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