Skip to content

Commit

Permalink
Modified home page and changed app icon. (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
Priyanka-Sachan authored and atm1504 committed Jan 5, 2020
1 parent 2d1248a commit 71ea5fa
Show file tree
Hide file tree
Showing 28 changed files with 124 additions and 221 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

<application
android:allowBackup="true"
android:icon="@mipmap/celesta_icon_round"
android:icon="@mipmap/anwesha_icon_round"
android:label="@string/app_name"
android:roundIcon="@mipmap/celesta_icon_round"
android:roundIcon="@mipmap/anwesha_icon_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/info/anwesha/iitp/about/AboutFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
github4.setOnClickListener(this);

Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/61836104_1185350021642288_3218647400700706816_n.jpg?_nc_cat=102&_nc_oc=AQks_Avrh-QmlQFcHGi2ug38TMWNY4xy6qpFT8fxfz451NDS3ahAIUOVwKIbn-O6KmE&_nc_ht=scontent.fdel29-1.fna&oh=ba5d514048981767bdc4b4c909b6708a&oe=5E35BDD7")
.placeholder(R.mipmap.celesta_icon_round).into(image1);
.placeholder(R.mipmap.anwesha_icon_round).into(image1);

Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/69644261_2115104492128356_6176772960083247104_n.jpg?_nc_cat=107&_nc_oc=AQk4WEUseafFdQvhhWhu0YFH6_9o8nBkkjTU7UJPzeK0NPWeppaKVIVUMtJUAGIZ6Yk&_nc_ht=scontent.fdel29-1.fna&oh=818707c46121857a62041b44ed4bd17c&oe=5DF2FCE3")
.placeholder(R.mipmap.celesta_icon_round).into(image2);
.placeholder(R.mipmap.anwesha_icon_round).into(image2);

Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/18813995_1182737558521894_2753272857627730485_n.jpg?_nc_cat=101&_nc_oc=AQlG0F8XVl3PnNTA1LnzMcfZ3p4cElt7WOpCtOADvw6N7eQcw-97L2RhxGWq-T2VDGk&_nc_ht=scontent.fdel29-1.fna&oh=70217968ca8de55d0a842ceac8ab8f41&oe=5E3796AA")
.placeholder(R.mipmap.celesta_icon_round).into(image3);
.placeholder(R.mipmap.anwesha_icon_round).into(image3);

Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/33490969_969879943175001_7316512759087104000_n.jpg?_nc_cat=105&_nc_oc=AQn_AxS6IX1lXlZZyVmn8sBqsAwQuU69Qg3VmDV65xgAmC_J9_zHJ5AkbPWEccCVU3A&_nc_ht=scontent.fdel29-1.fna&oh=871245e026dcfd1041ed75995ebe9deb&oe=5DF6A107")
.placeholder(R.mipmap.celesta_icon_round).into(image4);
.placeholder(R.mipmap.anwesha_icon_round).into(image4);

super.onViewCreated(view, savedInstanceState);
}
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/info/anwesha/iitp/home/HomeFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
View view = inflater.inflate(R.layout.fragment_home, container, false);

ImageView imageView = view.findViewById(R.id.main_logo_iv);
Glide.with(requireContext()).load(R.drawable.celesta_logo_long_2).into(imageView);
Glide.with(requireContext()).load(R.drawable.anwesha_logo_long_2).into(imageView);

Map<Integer, Integer> 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<Integer, Integer> pair : map.entrySet()) {
View mainView = view.findViewById(pair.getKey());
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/info/anwesha/iitp/home/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Binary file added app/src/main/res/drawable/anwesha_logo_long_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable/back.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_brightness_1_black_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#795548"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_events2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#4E342E"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,8h14v11zM7,10h5v5L7,15z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_gallery2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#4E342E"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_pronite2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#4E342E"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_touch_app.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#4E342E"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_touch_app_black_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#795548"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>
</vector>
13 changes: 13 additions & 0 deletions app/src/main/res/drawable/semi_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="-55dp">
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"
android:useLevel="false">
<solid android:color="#FFFDE7" />
<size
android:width="160dp"
android:height="160dp" />
</shape>
</item>
</layer-list>
Binary file added app/src/main/res/font/jim_nightshade.ttf
Binary file not shown.
Loading

0 comments on commit 71ea5fa

Please sign in to comment.