Skip to content

Commit eafec41

Browse files
author
yogeshbalan
committed
Comparison Activity added
Signed-off-by: yogeshbalan <[email protected]>
1 parent 6698865 commit eafec41

13 files changed

+975
-6
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="xyz.airquality" >
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="xyz.airquality" >
34

45
<permission
56
android:name="xyz.airquality.permission.MAPS_RECEIVE"
67
android:protectionLevel="signature" />
7-
88
<permission
99
android:name="xyz.airquality.permission.MAPS_RECEIVE"
1010
android:protectionLevel="signature" />
11+
1112
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
1213
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
1314
<uses-permission android:name="android.permission.INTERNET" />
@@ -37,15 +38,14 @@
3738
android:icon="@mipmap/ic_launcher"
3839
android:label="@string/app_name"
3940
android:theme="@style/AppTheme" >
40-
4141
<meta-data
4242
android:name="com.google.android.gms.version"
4343
android:value="@integer/google_play_services_version" />
4444

4545
<activity
4646
android:name=".MainActivity"
4747
android:label="@string/app_name"
48-
android:theme="@style/AppTheme.FullScreen">
48+
android:theme="@style/AppTheme.FullScreen" >
4949
<intent-filter>
5050
<action android:name="android.intent.action.MAIN" />
5151

@@ -71,7 +71,7 @@
7171
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
7272
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
7373

74-
<!-- IMPORTANT: Change "com.parse.starter" to match your app's package name. -->
74+
<!-- IMPORTANT: Change "com.parse.starter" to match your app's package name. -->
7575
<category android:name="xyz.airquality" />
7676
</intent-filter>
7777
</receiver>
@@ -82,8 +82,10 @@
8282
android:parentActivityName=".MainActivity" >
8383
<intent-filter>
8484
<action android:name="android.intent.action.MAIN" />
85+
8586
<category android:name="android.intent.category.LAUNCHER" />
8687
</intent-filter>
88+
8789
<meta-data
8890
android:name="android.support.PARENT_ACTIVITY"
8991
android:value="xyz.airquality.MainActivity" />
@@ -92,6 +94,20 @@
9294
<meta-data
9395
android:name="com.google.android.maps.v2.API_KEY"
9496
android:value="AIzaSyCX_e4eAHXaBEcxurTje791NtIdhfOH-Fw" />
97+
98+
<activity
99+
android:name=".ComparisonActivity"
100+
android:label="@string/title_activity_comparison"
101+
android:parentActivityName=".MainActivity" >
102+
<intent-filter>
103+
<action android:name="android.intent.action.MAIN" />
104+
105+
<category android:name="android.intent.category.LAUNCHER" />
106+
</intent-filter>
107+
<meta-data
108+
android:name="android.support.PARENT_ACTIVITY"
109+
android:value="xyz.airquality.MainActivity" />
110+
</activity>
95111
</application>
96112

97113
</manifest>

‎app/src/main/java/xyz/airquality/ComparisonActivity.java

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
package xyz.airquality;
2+
3+
import android.support.design.widget.TabLayout;
4+
import android.support.v4.app.Fragment;
5+
import android.support.v4.app.FragmentManager;
6+
import android.support.v4.app.FragmentPagerAdapter;
7+
import android.support.v4.view.ViewPager;
8+
import android.support.v7.app.AppCompatActivity;
9+
import android.os.Bundle;
10+
import android.support.v7.widget.Toolbar;
11+
import android.view.Menu;
12+
import android.view.MenuItem;
13+
14+
import java.util.ArrayList;
15+
import java.util.List;
16+
17+
import xyz.airquality.Fragments.ComparisonDaily;
18+
import xyz.airquality.Fragments.ComparisonHourly;
19+
20+
public class ComparisonActivity extends AppCompatActivity {
21+
22+
@Override
23+
protected void onCreate(Bundle savedInstanceState) {
24+
super.onCreate(savedInstanceState);
25+
setContentView(R.layout.activity_comparison);
26+
27+
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
28+
setSupportActionBar(toolbar);
29+
toolbar.setSubtitle("Comparing region1 and region2");
30+
31+
ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
32+
if (viewPager != null) {
33+
setupViewPager(viewPager);
34+
}
35+
36+
TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
37+
tabLayout.setupWithViewPager(viewPager);
38+
39+
}
40+
41+
private void setupViewPager(ViewPager viewPager) {
42+
Adapter adapter = new Adapter(getSupportFragmentManager());
43+
adapter.addFragment(new ComparisonHourly(), "Hourly");
44+
adapter.addFragment(new ComparisonDaily(), "Daily");
45+
viewPager.setAdapter(adapter);
46+
}
47+
48+
@Override
49+
public boolean onCreateOptionsMenu(Menu menu) {
50+
// Inflate the menu; this adds items to the action bar if it is present.
51+
getMenuInflater().inflate(R.menu.menu_comparison, menu);
52+
return true;
53+
}
54+
55+
@Override
56+
public boolean onOptionsItemSelected(MenuItem item) {
57+
// Handle action bar item clicks here. The action bar will
58+
// automatically handle clicks on the Home/Up button, so long
59+
// as you specify a parent activity in AndroidManifest.xml.
60+
int id = item.getItemId();
61+
62+
//noinspection SimplifiableIfStatement
63+
if (id == R.id.action_settings) {
64+
return true;
65+
}
66+
67+
return super.onOptionsItemSelected(item);
68+
}
69+
70+
static class Adapter extends FragmentPagerAdapter {
71+
private final List<Fragment> mFragments = new ArrayList<>();
72+
private final List<String> mFragmentTitles = new ArrayList<>();
73+
74+
public Adapter(FragmentManager fm) {
75+
super(fm);
76+
}
77+
78+
public void addFragment(Fragment fragment, String title) {
79+
mFragments.add(fragment);
80+
mFragmentTitles.add(title);
81+
}
82+
83+
@Override
84+
public Fragment getItem(int position) {
85+
return mFragments.get(position);
86+
}
87+
88+
@Override
89+
public int getCount() {
90+
return mFragments.size();
91+
}
92+
93+
@Override
94+
public CharSequence getPageTitle(int position) {
95+
return mFragmentTitles.get(position);
96+
}
97+
}
98+
}

0 commit comments

Comments
 (0)