diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 175c29f..176afd7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,9 +7,9 @@ map = new HashMap<>(); map.put(R.id.main_pronite_ll, R.id.nav_pronite); map.put(R.id.main_event_ll, R.id.nav_events_cat); map.put(R.id.main_gallery_ll, R.id.nav_gallery); - map.put(R.id.main_special_ll, R.id.nav_special_cat); - map.put(R.id.main_team_ll, R.id.nav_team); - map.put(R.id.main_sponsor_ll, R.id.nav_sponsors); + map.put(R.id.main_login_ll,R.id.nav_account); for (final Map.Entry pair : map.entrySet()) { View mainView = view.findViewById(pair.getKey()); diff --git a/app/src/main/java/info/anwesha/iitp/home/MainActivity.java b/app/src/main/java/info/anwesha/iitp/home/MainActivity.java index cb3f433..0c88112 100644 --- a/app/src/main/java/info/anwesha/iitp/home/MainActivity.java +++ b/app/src/main/java/info/anwesha/iitp/home/MainActivity.java @@ -160,7 +160,7 @@ private void populateHeaderView() { Glide.with(this) .load(prefs.getString("qr_code", "")) .centerCrop() - .placeholder(R.mipmap.celesta_icon_round) + .placeholder(R.mipmap.anwesha_icon_round) .into(profileImage); profileImage.setOnClickListener(view -> startActivity(new Intent(MainActivity.this, LoginRegisterActivity.class))); } diff --git a/app/src/main/java/info/anwesha/iitp/notification/FcmService.java b/app/src/main/java/info/anwesha/iitp/notification/FcmService.java index ecacf31..d785398 100644 --- a/app/src/main/java/info/anwesha/iitp/notification/FcmService.java +++ b/app/src/main/java/info/anwesha/iitp/notification/FcmService.java @@ -80,7 +80,7 @@ private void sendNotification(String title, String body, Bitmap image, String li PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT); NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, getString(R.string.default_notification_channel_id)) - .setSmallIcon(R.mipmap.celesta_icon_round) + .setSmallIcon(R.mipmap.anwesha_icon_round) .setContentTitle(title) .setContentText(body) .setAutoCancel(true) diff --git a/app/src/main/res/drawable/anwesha_logo_long_2.png b/app/src/main/res/drawable/anwesha_logo_long_2.png new file mode 100644 index 0000000..4134140 Binary files /dev/null and b/app/src/main/res/drawable/anwesha_logo_long_2.png differ diff --git a/app/src/main/res/drawable/back.jpg b/app/src/main/res/drawable/back.jpg index 7d01001..7970a18 100644 Binary files a/app/src/main/res/drawable/back.jpg and b/app/src/main/res/drawable/back.jpg differ diff --git a/app/src/main/res/drawable/ic_brightness_1_black_24dp.xml b/app/src/main/res/drawable/ic_brightness_1_black_24dp.xml new file mode 100644 index 0000000..dda4603 --- /dev/null +++ b/app/src/main/res/drawable/ic_brightness_1_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_events2.xml b/app/src/main/res/drawable/ic_events2.xml new file mode 100644 index 0000000..fb26532 --- /dev/null +++ b/app/src/main/res/drawable/ic_events2.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_gallery2.xml b/app/src/main/res/drawable/ic_gallery2.xml new file mode 100644 index 0000000..727abed --- /dev/null +++ b/app/src/main/res/drawable/ic_gallery2.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_pronite2.xml b/app/src/main/res/drawable/ic_pronite2.xml new file mode 100644 index 0000000..7beda00 --- /dev/null +++ b/app/src/main/res/drawable/ic_pronite2.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_touch_app.xml b/app/src/main/res/drawable/ic_touch_app.xml new file mode 100644 index 0000000..e8a0c1b --- /dev/null +++ b/app/src/main/res/drawable/ic_touch_app.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_touch_app_black_24dp.xml b/app/src/main/res/drawable/ic_touch_app_black_24dp.xml new file mode 100644 index 0000000..f1fd4c7 --- /dev/null +++ b/app/src/main/res/drawable/ic_touch_app_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/semi_circle.xml b/app/src/main/res/drawable/semi_circle.xml new file mode 100644 index 0000000..1d9a884 --- /dev/null +++ b/app/src/main/res/drawable/semi_circle.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/jim_nightshade.ttf b/app/src/main/res/font/jim_nightshade.ttf new file mode 100644 index 0000000..962b19f Binary files /dev/null and b/app/src/main/res/font/jim_nightshade.ttf differ diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index ce10cfa..1746c93 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,258 +6,114 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".home.HomeFragment"> - + android:padding="16dp" + app:layout_constraintTop_toTopOf="parent"/> - - - - - - - - - + android:layout_height="550dp" + android:src="@drawable/semi_circle" + android:scaleType="centerCrop" + app:layout_constraintBottom_toBottomOf="parent"/> - - - - - - - - - - - - - - - + app:layout_constraintBottom_toBottomOf="parent" + android:paddingBottom="20dp"> + android:layout_weight="1"> + android:layout_gravity="center"/> - + android:textColor="@color/brown" + android:textSize="@dimen/mi_text_size" /> - - + android:layout_weight="1"> - + android:src="@drawable/ic_pronite2" + android:layout_gravity="center"/> - - - - - - - - - - - - - - - - - + android:textColor="@color/brown" + android:textSize="@dimen/mi_text_size" + android:layout_gravity="center"/> - - + android:layout_weight="1"> - + android:src="@drawable/ic_touch_app" + android:layout_gravity="center"/> - + android:fontFamily="@font/jim_nightshade" + android:text="Join Us" + android:textColor="@color/brown" + android:textSize="@dimen/mi_text_size" + android:layout_gravity="center"/> - + android:layout_weight="1"> - + android:layout_gravity="center"/> - + android:fontFamily="@font/jim_nightshade" + android:text="Gallery" + android:textColor="@color/brown" + android:textSize="@dimen/mi_text_size" + android:layout_gravity="center"/> - - - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/anwesha_icon_round.png b/app/src/main/res/mipmap-hdpi/anwesha_icon_round.png new file mode 100644 index 0000000..619d647 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/anwesha_icon_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/celesta_icon_round.png b/app/src/main/res/mipmap-hdpi/celesta_icon_round.png deleted file mode 100644 index 0fb17c1..0000000 Binary files a/app/src/main/res/mipmap-hdpi/celesta_icon_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/anwesha_icon_round.png b/app/src/main/res/mipmap-mdpi/anwesha_icon_round.png new file mode 100644 index 0000000..619d647 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/anwesha_icon_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/celesta_icon_round.png b/app/src/main/res/mipmap-mdpi/celesta_icon_round.png deleted file mode 100644 index 8515dea..0000000 Binary files a/app/src/main/res/mipmap-mdpi/celesta_icon_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/anwesha_icon_round.png b/app/src/main/res/mipmap-xhdpi/anwesha_icon_round.png new file mode 100644 index 0000000..619d647 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/anwesha_icon_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/celesta_icon_round.png b/app/src/main/res/mipmap-xhdpi/celesta_icon_round.png deleted file mode 100644 index 286775f..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/celesta_icon_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/anwesha_icon_round.png b/app/src/main/res/mipmap-xxhdpi/anwesha_icon_round.png new file mode 100644 index 0000000..619d647 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/anwesha_icon_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/celesta_icon_round.png b/app/src/main/res/mipmap-xxhdpi/celesta_icon_round.png deleted file mode 100644 index b44d379..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/celesta_icon_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/anwesha_icon_round.png b/app/src/main/res/mipmap-xxxhdpi/anwesha_icon_round.png new file mode 100644 index 0000000..619d647 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/anwesha_icon_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/celesta_icon_round.png b/app/src/main/res/mipmap-xxxhdpi/celesta_icon_round.png deleted file mode 100644 index 5468c82..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/celesta_icon_round.png and /dev/null differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7da93c0..3149780 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,4 +17,6 @@ #aa646B6D #661E263F + #3E2723 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 1b43149..db30c5b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,4 +1,8 @@ 176dp + 14sp + 50dp + 50dp + \ No newline at end of file