Skip to content

Commit c7527cb

Browse files
committed
Added shop functionality
1 parent 212555b commit c7527cb

21 files changed

+709
-193
lines changed
Binary file not shown.

.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

.idea/caches/gradle_models.ser

0 Bytes
Binary file not shown.

.idea/workspace.xml

Lines changed: 235 additions & 178 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/AndroidManifest.xml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.example.offlinemaps">
4-
54
<!--
65
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
76
Google Maps Android API v2, but you must specify either coarse or fine
@@ -12,33 +11,28 @@
1211
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1312
<uses-permission android:name="android.permission.INTERNET" />
1413

15-
1614
<application
1715
android:allowBackup="true"
1816
android:icon="@mipmap/ic_launcher"
1917
android:label="@string/app_name"
2018
android:roundIcon="@mipmap/ic_launcher_round"
2119
android:supportsRtl="true"
2220
android:theme="@style/AppTheme">
23-
<service
24-
android:name=".GettingDeviceTokenService">
21+
<activity
22+
android:name=".ShopActivity"
23+
android:label="@string/title_activity_shop"
24+
android:screenOrientation="portrait"
25+
android:theme="@style/AppTheme.NoActionBar"></activity>
2526

27+
<service android:name=".GettingDeviceTokenService">
2628
<intent-filter>
27-
28-
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
29-
30-
29+
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
3130
</intent-filter>
3231
</service>
33-
<service
34-
android:name=".NotificationService">
35-
32+
<service android:name=".NotificationService">
3633
<intent-filter>
37-
38-
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
39-
34+
<action android:name="com.google.firebase.MESSAGING_EVENT" />
4035
</intent-filter>
41-
4236
</service>
4337

4438
<activity

app/src/main/java/com/example/offlinemaps/FriendsUI.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ public void selectDrawerItem(MenuItem menuItem) {
170170
startActivity(profile);
171171
finish();
172172
break;
173+
case R.id.nav_shop:
174+
Intent shop = new Intent(FriendsUI.this, ShopActivity.class);
175+
startActivity(shop);
176+
finish();
177+
break;
173178
}
174179
menuItem.setChecked(true);
175180
mDrawer.closeDrawers();

app/src/main/java/com/example/offlinemaps/GoalsActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,11 @@ public void selectDrawerItem(MenuItem menuItem) {
159159
startActivity(profile);
160160
finish();
161161
break;
162+
case R.id.nav_shop:
163+
Intent shop = new Intent(GoalsActivity.this, ShopActivity.class);
164+
startActivity(shop);
165+
finish();
166+
break;
162167
}
163168
menuItem.setChecked(true);
164169
mDrawer.closeDrawers();

app/src/main/java/com/example/offlinemaps/Leaderboard.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ public void selectDrawerItem(MenuItem menuItem) {
177177
startActivity(profile);
178178
finish();
179179
break;
180+
case R.id.nav_shop:
181+
Intent shop = new Intent(Leaderboard.this, ShopActivity.class);
182+
finish();
183+
break;
180184
}
181185
menuItem.setChecked(true);
182186
mDrawer.closeDrawers();

app/src/main/java/com/example/offlinemaps/LeaderboardAdapterClass.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
7171
TextView name = (TextView) listItem.findViewById(R.id.tv_username);
7272
if (!currentUser.getmUid().equals(FirebaseAuth.getInstance().getUid())) {
7373
name.setText(currentUser.getmUsername());
74+
listItem.setBackgroundColor(Color.WHITE);
7475
} else {
7576
name.setText("You");
7677
listItem.setBackgroundColor(Color.GREEN);

app/src/main/java/com/example/offlinemaps/ProfileUI.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@ public void selectDrawerItem(MenuItem menuItem) {
166166
startActivity(friends);
167167
finish();
168168
break;
169+
case R.id.nav_shop:
170+
Intent shop = new Intent(ProfileUI.this, ShopActivity.class);
171+
startActivity(shop);
172+
finish();
173+
break;
169174
}
170175
menuItem.setChecked(true);
171176
mDrawer.closeDrawers();

0 commit comments

Comments
 (0)