modified

moisesaq · Aug 17, 2016 · 52932af · 52932af
1 parent 1dd3f06
commit 52932af
Show file tree

Hide file tree

Showing 15 changed files with 116 additions and 56 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/app.iml b/app/app.iml
@@ -12,10 +12,7 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,6 +47,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -64,42 +68,45 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/me.relex/circleindicator/1.1.8/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="circleindicator-1.1.8" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="greendao-2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="glide-3.6.0" level="project" />
-    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="greendao-2.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.apaza.moises.practicegreendao"
-        minSdkVersion 14
+        minSdkVersion 11
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme" >
-
         <activity
             android:name=".login.SplashActivity"
             android:label="@string/title_activity_splash"
@@ -24,20 +23,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".login.SignUpActivity"
             android:label="@string/title_activity_signup"
             android:theme="@style/AppTheme.NoActionBar" >
         </activity>
-
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar" >
         </activity>
-
-
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/apaza/moises/practicegreendao/Calculadora.java b/app/src/main/java/com/apaza/moises/practicegreendao/Calculadora.java
@@ -0,0 +1,41 @@
+package com.apaza.moises.practicegreendao;
+
+public class Calculadora {
+
+    private double numeroA;
+    private double numeroB;
+    public double resultado;
+
+    public Calculadora(){
+
+    }
+
+    public Calculadora(double numeroA, double numeroB){
+        this.numeroA = numeroA;
+        this.numeroB = numeroB;
+    }
+
+    public void sumar(){
+
+    }
+
+    private void restar(){
+
+    }
+
+    public void setNumeroA(double a){
+        this.numeroA = a;
+    }
+
+    public double getNumeroA(){
+        return numeroA;
+    }
+
+    public void setNumeroB(double b){
+        this.numeroB = b;
+    }
+
+    public double getNumeroB(){
+        return numeroB;
+    }
+}
diff --git a/app/src/main/java/com/apaza/moises/practicegreendao/MainActivity.java b/app/src/main/java/com/apaza/moises/practicegreendao/MainActivity.java
@@ -50,7 +50,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         if (id == R.id.action_see_list) {
-            showFragment(ListFragment.newInstance());
+            //showFragment(ListFragment.newInstance());
             return true;
         }
 

diff --git a/...racticegreendao/login/SignUpFragment.java → ...icegreendao/login/OnBoardingFragment.java b/...racticegreendao/login/SignUpFragment.java → ...icegreendao/login/OnBoardingFragment.java
@@ -19,7 +19,7 @@
 
 import me.relex.circleindicator.CircleIndicator;
 
-public class SignUpFragment extends Fragment {
+public class OnBoardingFragment extends Fragment {
 
     private static final String ARG_PARAM1 = "param1";
     private String mParam1;
@@ -35,12 +35,12 @@ public class SignUpFragment extends Fragment {
 
     private OnFragmentSignUpListener mListener;
 
-    public static SignUpFragment newInstance() {
-        SignUpFragment fragment = new SignUpFragment();
+    public static OnBoardingFragment newInstance() {
+        OnBoardingFragment fragment = new OnBoardingFragment();
         return fragment;
     }
 
-    public SignUpFragment() {
+    public OnBoardingFragment() {
         // Required empty public constructor
     }
 

diff --git a/app/src/main/java/com/apaza/moises/practicegreendao/login/SignUpActivity.java b/app/src/main/java/com/apaza/moises/practicegreendao/login/SignUpActivity.java
@@ -1,8 +1,6 @@
 package com.apaza.moises.practicegreendao.login;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -12,7 +10,7 @@
 
 import com.apaza.moises.practicegreendao.R;
 
-public class SignUpActivity extends AppCompatActivity implements SignUpFragment.OnFragmentSignUpListener{
+public class SignUpActivity extends AppCompatActivity implements OnBoardingFragment.OnFragmentSignUpListener{
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -22,7 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
 
         toolbar.setVisibility(View.GONE);
-        showFragment(SignUpFragment.newInstance());
+        showFragment(OnBoardingFragment.newInstance());
 
         /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {

diff --git a/app/src/main/java/com/apaza/moises/practicegreendao/login/SplashActivity.java b/app/src/main/java/com/apaza/moises/practicegreendao/login/SplashActivity.java
@@ -35,8 +35,8 @@ public void onTick(long millisUntilFinished) {
 
             public void onFinish() {
                 counter.setText("Go!");
-                //goToMainActivity();
-                goToSignUpActivity();
+                goToMainActivity();
+                //goToSignUpActivity();
             }
         }.start();
     }

diff --git a/app/src/main/res/layout/fragment_sign_up.xml b/app/src/main/res/layout/fragment_sign_up.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    tools:context="com.apaza.moises.practicegreendao.login.SignUpFragment">
+    tools:context="com.apaza.moises.practicegreendao.login.OnBoardingFragment">
 
     <FrameLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/pager_layout.xml b/app/src/main/res/layout/pager_layout.xml
@@ -7,5 +7,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/imageView"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:scaleType="fitCenter"/>
 </FrameLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -21,4 +21,5 @@
     </string>
     <string name="title_activity_signup">SignupActivity</string>
     <string name="title_activity_splash">SplashActivity</string>
+    <string name="title_activity_practice_animation">PracticeAnimationActivity</string>
 </resources>