Skip to content

Commit 8d9a755

Browse files
author
Hollis Kim
committed
Merge branch 'release/REL_0.0.1'
Conflicts: app/src/main/java/com/firstbuild/androidapp/sousvideUI/BeefFragment.java app/src/main/res/layout/fragment_beef.xml
2 parents f7e1420 + 4029f7f commit 8d9a755

File tree

71 files changed

+3191
-1610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3191
-1610
lines changed

‎app/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 21
5-
buildToolsVersion "21.1.1"
5+
buildToolsVersion "21.1.2"
66

77
defaultConfig {
88
applicationId "com.firstbuild.androidapp"
99
minSdkVersion 18
1010
targetSdkVersion 21
1111
versionCode 1
12-
versionName "0.0.2"
12+
versionName "0.0.1"
1313
}
1414
buildTypes {
1515
release {
@@ -22,4 +22,6 @@ android {
2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
compile 'com.android.support:appcompat-v7:21.0.3'
25+
compile 'com.android.support:recyclerview-v7:+'
26+
compile 'com.getbase:floatingactionbutton:1.9.0'
2527
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
android:theme="@style/AppTheme" >
2525
<activity
2626
android:name=".SplashActivity"
27-
android:screenOrientation="portrait"
28-
android:label="@string/title_activity_splash" >
27+
android:label="@string/title_activity_splash"
28+
android:screenOrientation="portrait" >
2929
<intent-filter>
3030
<action android:name="android.intent.action.MAIN" />
3131

@@ -34,15 +34,28 @@
3434
</activity>
3535
<activity
3636
android:name=".cookingMethod.CookingMethodActivity"
37-
android:screenOrientation="portrait"
38-
android:label="@string/title_activity_cooking_method" >
37+
android:label="@string/title_activity_cooking_method"
38+
android:screenOrientation="portrait" >
3939
</activity>
4040
<activity
4141
android:name=".sousvideUI.SousvideActivity"
42-
android:screenOrientation="portrait"
43-
android:label="@string/title_activity_sousvide" >
42+
android:label="@string/title_activity_sousvide"
43+
android:screenOrientation="portrait" >
44+
</activity>
45+
<activity
46+
android:name=".dashboard.DashboardActivity"
47+
android:label="@string/title_activity_dashboard"
48+
android:screenOrientation="portrait" >
49+
</activity>
50+
<activity
51+
android:name=".Paragon.ParagonMainActivity"
52+
android:label="@string/title_activity_paragon_main"
53+
android:screenOrientation="portrait" >
54+
</activity>
55+
<activity
56+
android:name=".AddProduct.AddProductActivity"
57+
android:label="@string/title_activity_add_product" >
4458
</activity>
45-
<service android:name="com.firstbuild.commonframework.bleManager.BluetoothLeService" android:enabled="true"/>
4659
</application>
4760

4861
</manifest>

‎app/src/main/java/com/firstbuild/androidapp/AddProduct/AddProductActivity.java‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
package com.firstbuild.androidapp.AddProduct;
2+
3+
import android.animation.Animator;
4+
import android.annotation.TargetApi;
5+
import android.app.Activity;
6+
import android.os.Build;
7+
import android.os.Bundle;
8+
import android.view.Menu;
9+
import android.view.MenuItem;
10+
import android.view.View;
11+
import android.view.ViewAnimationUtils;
12+
13+
import com.firstbuild.androidapp.R;
14+
15+
public class AddProductActivity extends Activity {
16+
private String TAG = AddProductActivity.class.getSimpleName();
17+
18+
@Override
19+
protected void onCreate(Bundle savedInstanceState) {
20+
super.onCreate(savedInstanceState);
21+
22+
setContentView(R.layout.activity_add_product);
23+
24+
25+
26+
getFragmentManager().
27+
beginTransaction().
28+
replace(R.id.content_frame, new AddProductSelectFragment()).
29+
addToBackStack(null).
30+
commit();
31+
32+
// getWindow().getEnterTransition().addListener(new Transition.TransitionListener() {
33+
// @Override
34+
// public void onTransitionStart(Transition transition) {
35+
// Log.d(TAG, "onTransitionStart");
36+
// }
37+
//
38+
// @Override
39+
// public void onTransitionEnd(Transition transition) {
40+
// Log.d(TAG, "onTransitionEnd");
41+
// }
42+
//
43+
// @Override
44+
// public void onTransitionCancel(Transition transition) {
45+
// Log.d(TAG, "onTransitionCancel");
46+
// }
47+
//
48+
// @Override
49+
// public void onTransitionPause(Transition transition) {
50+
// Log.d(TAG, "onTransitionPause");
51+
// }
52+
//
53+
// @Override
54+
// public void onTransitionResume(Transition transition) {
55+
// Log.d(TAG, "onTransitionResume");
56+
// }
57+
// });
58+
59+
}
60+
61+
// @TargetApi(Build.VERSION_CODES.LOLLIPOP)
62+
// private void enterReveal() {
63+
// // previously invisible view
64+
// final View myView = findViewById(R.id.layoutSelectProduct);
65+
//
66+
// // get the center for the clipping circle
67+
// int cx = myView.getMeasuredWidth() / 2;
68+
// int cy = myView.getMeasuredHeight() / 2;
69+
//
70+
// // get the final radius for the clipping circle
71+
// int finalRadius = Math.max(myView.getWidth(), myView.getHeight()) / 2;
72+
// Animator anim = ViewAnimationUtils.createCircularReveal(myView, cx, cy, 0, finalRadius);
73+
// myView.setVisibility(View.VISIBLE);
74+
// anim.addListener(new Animator.AnimatorListener() {
75+
// @Override
76+
// public void onAnimationStart(Animator animation) {
77+
//
78+
// }
79+
//
80+
// @Override
81+
// public void onAnimationEnd(Animator animation) {
82+
//// getWindow().getEnterTransition().removeListener(transitionListener);
83+
// }
84+
//
85+
// @Override
86+
// public void onAnimationCancel(Animator animation) {
87+
//
88+
// }
89+
//
90+
// @Override
91+
// public void onAnimationRepeat(Animator animation) {
92+
//
93+
// }
94+
// });
95+
// anim.start();
96+
// }
97+
98+
@Override
99+
public boolean onCreateOptionsMenu(Menu menu) {
100+
// Inflate the menu; this adds items to the action bar if it is present.
101+
getMenuInflater().inflate(R.menu.menu_add_product, menu);
102+
return true;
103+
}
104+
105+
@Override
106+
public boolean onOptionsItemSelected(MenuItem item) {
107+
// Handle action bar item clicks here. The action bar will
108+
// automatically handle clicks on the Home/Up button, so long
109+
// as you specify a parent activity in AndroidManifest.xml.
110+
int id = item.getItemId();
111+
112+
//noinspection SimplifiableIfStatement
113+
if (id == R.id.action_settings) {
114+
return true;
115+
}
116+
117+
return super.onOptionsItemSelected(item);
118+
}
119+
120+
121+
// void exitReveal() {
122+
// // previously visible view
123+
// final View myView = findViewById(R.id.my_view);
124+
//
125+
// // get the center for the clipping circle
126+
// int cx = myView.getMeasuredWidth() / 2;
127+
// int cy = myView.getMeasuredHeight() / 2;
128+
//
129+
// // get the initial radius for the clipping circle
130+
// int initialRadius = myView.getWidth() / 2;
131+
//
132+
// // create the animation (the final radius is zero)
133+
// Animator anim =
134+
// ViewAnimationUtils.createCircularReveal(myView, cx, cy, initialRadius, 0);
135+
//
136+
// // make the view invisible when the animation is done
137+
// anim.addListener(new AnimatorListenerAdapter() {
138+
// @Override
139+
// public void onAnimationEnd(Animator animation) {
140+
// super.onAnimationEnd(animation);
141+
// myView.setVisibility(View.INVISIBLE);
142+
// }
143+
// });
144+
//
145+
// // start the animation
146+
// anim.start();
147+
// }
148+
}

‎app/src/main/java/com/firstbuild/androidapp/AddProduct/AddProductParagonFragment.java‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package com.firstbuild.androidapp.AddProduct;
2+
3+
4+
import android.os.Bundle;
5+
import android.app.Fragment;
6+
import android.view.LayoutInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
import android.view.animation.Animation;
10+
import android.view.animation.RotateAnimation;
11+
import android.view.animation.TranslateAnimation;
12+
import android.widget.LinearLayout;
13+
14+
import com.firstbuild.androidapp.R;
15+
16+
/**
17+
* A simple {@link Fragment} subclass.
18+
*/
19+
public class AddProductParagonFragment extends Fragment {
20+
21+
22+
public AddProductParagonFragment() {
23+
// Required empty public constructor
24+
}
25+
26+
27+
@Override
28+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
29+
Bundle savedInstanceState) {
30+
// Inflate the layout for this fragment
31+
View view = inflater.inflate(R.layout.fragment_blank_fragmen_add_product_paragon, container, false);
32+
33+
// view.findViewById(R.id.imgSpinner).startAnimation(makeAnimation());
34+
35+
return view;
36+
}
37+
38+
39+
private RotateAnimation makeAnimation() {
40+
41+
RotateAnimation animation = new RotateAnimation(0, 360);
42+
animation.setDuration(250);
43+
44+
animation.setAnimationListener(new Animation.AnimationListener() {
45+
public void onAnimationStart(Animation animation) {
46+
47+
}
48+
49+
public void onAnimationEnd(Animation animation) {
50+
51+
}
52+
53+
public void onAnimationRepeat(Animation animation) {
54+
55+
}
56+
});
57+
58+
return animation;
59+
}
60+
61+
}

‎app/src/main/java/com/firstbuild/androidapp/AddProduct/AddProductSelectFragment.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
package com.firstbuild.androidapp.AddProduct;
2+
3+
import android.app.Activity;
4+
import android.net.Uri;
5+
import android.os.Bundle;
6+
import android.app.Fragment;
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
11+
import com.firstbuild.androidapp.R;
12+
13+
public class AddProductSelectFragment extends Fragment {
14+
15+
public AddProductSelectFragment() {
16+
// Required empty public constructor
17+
}
18+
19+
@Override
20+
public void onCreate(Bundle savedInstanceState) {
21+
super.onCreate(savedInstanceState);
22+
}
23+
24+
@Override
25+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
26+
Bundle savedInstanceState) {
27+
// Inflate the layout for this fragment
28+
View view = inflater.inflate(R.layout.fragment_add_product_paragon, container, false);
29+
30+
view.findViewById(R.id.layoutParagon).setOnClickListener(new View.OnClickListener() {
31+
@Override
32+
public void onClick(View v) {
33+
getFragmentManager().
34+
beginTransaction().
35+
replace(R.id.content_frame, new AddProductParagonFragment()).
36+
addToBackStack(null).
37+
commit();
38+
}
39+
});
40+
41+
42+
return view;
43+
}
44+
45+
46+
}

0 commit comments

Comments
 (0)