therbron/Moodl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add watchlist transition animations

Browse Source
This commit is contained in:
Tanguy Herbron 2018-05-13 04:03:16 +02:00
parent e5ab35b9bd
commit 8c9c6b4cd0
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/nauk/moodl/Activities/CurrencyDetailsActivity.java
View File

@ -140,7 +140,16 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
finish();
if(viewFlipper.getDisplayedChild() == 0)
{
finishAfterTransition();
}
else
{
finish();
}
return true; return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);

2
app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Watchlist.java
View File

@ -250,7 +250,7 @@ public class Watchlist extends Fragment {
public void run() { public void run() {
for(Currency currency : watchlistManager.getWatchlist()) for(Currency currency : watchlistManager.getWatchlist())
{ {
((LinearLayout) view.findViewById(R.id.linearLayoutWatchlist)).addView(new CurrencyCardview(getContext(), currency)); ((LinearLayout) view.findViewById(R.id.linearLayoutWatchlist)).addView(new CurrencyCardview(getContext(), currency, getActivity()));
} }
} }
}); });

11
app/src/main/java/com/nauk/moodl/DataManagers/CurrencyData/CurrencyCardview.java
View File

@ -1,5 +1,7 @@
package com.nauk.moodl.DataManagers.CurrencyData; package com.nauk.moodl.DataManagers.CurrencyData;
import android.app.Activity;
import android.app.ActivityOptions;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
@ -21,6 +23,7 @@ import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData; import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet; import com.github.mikephil.charting.data.LineDataSet;
import com.nauk.moodl.Activities.CurrencyDetailsActivity; import com.nauk.moodl.Activities.CurrencyDetailsActivity;
import com.nauk.moodl.Activities.HomeActivityFragments.Summary;
import com.nauk.moodl.DataManagers.PreferencesManager; import com.nauk.moodl.DataManagers.PreferencesManager;
import com.nauk.moodl.PlaceholderManager; import com.nauk.moodl.PlaceholderManager;
import com.nauk.moodl.R; import com.nauk.moodl.R;
@ -43,7 +46,7 @@ public class CurrencyCardview extends CardView {
super(context); super(context);
} }
public CurrencyCardview(@NonNull final Context context, final Currency currency) public CurrencyCardview(@NonNull final Context context, final Currency currency, final Activity activity)
{ {
super (context); super (context);
@ -97,9 +100,11 @@ public class CurrencyCardview extends CardView {
findViewById(R.id.LineChartView).setOnClickListener(new View.OnClickListener() { findViewById(R.id.LineChartView).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Intent intent = new Intent(context.getApplicationContext(), CurrencyDetailsActivity.class); Intent intent = new Intent(activity, CurrencyDetailsActivity.class);
intent.putExtra("currency", currency); intent.putExtra("currency", currency);
context.getApplicationContext().startActivity(intent); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, findViewById(R.id.LineChartView), "chart");
activity.startActivity(intent, activityOptions.toBundle());
} }
}); });

1
app/src/main/res/layout/activity_currency_details.xml
View File

@ -63,6 +63,7 @@
android:id="@+id/chartPriceView" android:id="@+id/chartPriceView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:transitionName="chart"
android:layout_weight="0.5"/> android:layout_weight="0.5"/>
<com.github.mikephil.charting.charts.CandleStickChart <com.github.mikephil.charting.charts.CandleStickChart

3
app/src/main/res/layout/cardview_currency.xml
View File

@ -204,7 +204,8 @@
<com.github.mikephil.charting.charts.LineChart <com.github.mikephil.charting.charts.LineChart
android:id="@+id/LineChartView" android:id="@+id/LineChartView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"
android:transitionName="chart"/>
<ImageView <ImageView
android:id="@+id/detailsArrow" android:id="@+id/detailsArrow"