-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathFIRST_COMMIT.patch
More file actions
293 lines (289 loc) · 18.4 KB
/
FIRST_COMMIT.patch
File metadata and controls
293 lines (289 loc) · 18.4 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
Index: app/src/main/res/drawable/ic_info.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/drawable/ic_info.xml (date 1597489877673)
+++ app/src/main/res/drawable/ic_info.xml (date 1597489877673)
@@ -0,0 +1,6 @@
+<vector android:height="60dp" android:viewportHeight="496.158"
+ android:viewportWidth="496.158" android:width="60dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#25B7D3" android:pathData="M496.158,248.085c0,-137.022 -111.069,-248.082 -248.075,-248.082C111.07,0.003 0,111.063 0,248.085c0,137.001 111.07,248.07 248.083,248.07C385.089,496.155 496.158,385.086 496.158,248.085z"/>
+ <path android:fillColor="#FFFFFF" android:pathData="M315.249,359.555c-1.387,-2.032 -4.048,-2.755 -6.27,-1.702c-24.582,11.637 -52.482,23.94 -57.958,25.015c-0.138,-0.123 -0.357,-0.348 -0.644,-0.737c-0.742,-1.005 -1.103,-2.318 -1.103,-4.015c0,-13.905 10.495,-56.205 31.192,-125.719c17.451,-58.406 19.469,-70.499 19.469,-74.514c0,-6.198 -2.373,-11.435 -6.865,-15.146c-4.267,-3.519 -10.229,-5.302 -17.719,-5.302c-12.459,0 -26.899,4.73 -44.146,14.461c-16.713,9.433 -35.352,25.41 -55.396,47.487c-1.569,1.729 -1.733,4.314 -0.395,6.228c1.34,1.915 3.825,2.644 5.986,1.764c7.037,-2.872 42.402,-17.359 47.557,-20.597c4.221,-2.646 7.875,-3.989 10.861,-3.989c0.107,0 0.199,0.004 0.276,0.01c0.036,0.198 0.07,0.5 0.07,0.933c0,3.047 -0.627,6.654 -1.856,10.703c-30.136,97.641 -44.785,157.498 -44.785,182.994c0,8.998 2.501,16.242 7.432,21.528c5.025,5.393 11.803,8.127 20.146,8.127c8.891,0 19.712,-3.714 33.08,-11.354c12.936,-7.392 32.68,-23.653 60.363,-49.717C316.337,364.326 316.636,361.587 315.249,359.555z"/>
+ <path android:fillColor="#FFFFFF" android:pathData="M314.282,76.672c-4.925,-5.041 -11.227,-7.597 -18.729,-7.597c-9.34,0 -17.475,3.691 -24.176,10.971c-6.594,7.16 -9.938,15.946 -9.938,26.113c0,8.033 2.463,14.69 7.32,19.785c4.922,5.172 11.139,7.794 18.476,7.794c8.958,0 17.049,-3.898 24.047,-11.586c6.876,-7.553 10.363,-16.433 10.363,-26.393C321.646,88.105 319.169,81.684 314.282,76.672z"/>
+</vector>
Index: app/src/main/res/layout/activity_main.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/layout/activity_main.xml (revision ed423c7768b2f2bea0380dea5e8711975ba29d0c)
+++ app/src/main/res/layout/activity_main.xml (date 1597490715852)
@@ -68,6 +68,55 @@
app:layout_constraintStart_toEndOf="@+id/syllabus"
app:layout_constraintTop_toTopOf="parent" />
+ <Button
+ android:id="@+id/attendancecalculator"
+ android:layout_width="165dp"
+ android:layout_height="156dp"
+
+ android:layout_marginStart="15dp"
+ android:layout_marginTop="96dp"
+ android:layout_marginBottom="194dp"
+ android:background="@drawable/button_border_main"
+ android:clickable="true"
+ android:contentDescription="@string/attendance_calculator"
+ android:drawableTop="@drawable/ic_calendar"
+ android:focusable="true"
+
+ android:gravity="center"
+ android:paddingTop="25dp"
+ android:text="@string/attendance_calculator"
+ android:textSize="19sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/syllabus"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/syllabus"
+ app:layout_constraintVertical_weight="1" />
+
+ <Button
+ android:id="@+id/about_us"
+ android:layout_width="165dp"
+ android:layout_height="156dp"
+
+ android:layout_marginEnd="16dp"
+ android:background="@drawable/button_border_main"
+ android:clickable="true"
+ android:contentDescription="@string/attendance_calculator"
+ android:drawableTop="@drawable/ic_info"
+ android:focusable="true"
+ android:gravity="center"
+ android:paddingTop="25dp"
+
+ android:text="@string/about_app"
+ android:textSize="19sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="@+id/gpacalculator"
+ app:layout_constraintTop_toBottomOf="@+id/syllabus"
+ app:layout_constraintVertical_bias="0.333"
+ app:layout_constraintVertical_weight="1" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
Index: app/src/main/java/com/example/imscbit/Attendance_Calculator.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/imscbit/Attendance_Calculator.kt (date 1597491696698)
+++ app/src/main/java/com/example/imscbit/Attendance_Calculator.kt (date 1597491696698)
@@ -0,0 +1,14 @@
+package com.example.imscbit
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.widget.Button
+
+class Attendance_Calculator : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_attendance__calculator)
+ }
+ val bt=findViewById<Button>(R.id.attendacecalculate)
+ bt.
+}
\ No newline at end of file
Index: app/src/main/res/layout/activity_attendance__calculator.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/layout/activity_attendance__calculator.xml (date 1597491696721)
+++ app/src/main/res/layout/activity_attendance__calculator.xml (date 1597491696721)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:context=".Attendance_Calculator">
+
+
+ <EditText
+ android:id="@+id/attended"
+ android:layout_width="match_parent"
+ android:layout_height="41dp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/rounded_border"
+ android:ems="10"
+ android:hint="@string/sem_1"
+ android:importantForAutofill="no"
+ android:inputType="number"
+ android:text="@string/class_attended" />
+
+ <EditText
+ android:id="@+id/total"
+ android:layout_width="match_parent"
+ android:layout_height="41dp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/rounded_border"
+ android:ems="10"
+ android:hint="@string/sem_1"
+ android:importantForAutofill="no"
+ android:inputType="number"
+ android:text="@string/total_classes" />
+
+
+
+ <TextView
+ android:id="@+id/attendance"
+ android:layout_width="match_parent"
+ android:layout_height="41dp"
+ android:textSize="24sp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/rounded_border"
+ android:visibility="invisible"
+ />
+ <TextView
+ android:id="@+id/rattendance"
+ android:layout_width="match_parent"
+ android:layout_height="41dp"
+ android:textSize="24sp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/rounded_border"
+ android:visibility="invisible"
+ />
+ <TextView
+ android:id="@+id/rattendance2"
+ android:layout_width="match_parent"
+ android:layout_height="41dp"
+ android:textSize="24sp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/rounded_border"
+ android:visibility="invisible"
+ />
+
+ <Button
+ android:id="@+id/attendacecalculate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="30dp"
+ android:text="@string/calculate"
+ android:background="@drawable/button_border"
+ android:layout_marginBottom="15dp" />
+</LinearLayout>
\ No newline at end of file
Index: app/src/main/res/values/strings.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/values/strings.xml (revision ed423c7768b2f2bea0380dea5e8711975ba29d0c)
+++ app/src/main/res/values/strings.xml (date 1597491696750)
@@ -63,6 +63,10 @@
<string name="select_no_of_semester" />
<string name="calculate">Calculate</string>
<string name="cgpa">CGPA:</string>
+ <string name="attendance_calculator">Attendance Calculator</string>
+ <string name="about_app">About App</string>
+ <string name="class_attended">Class Attended</string>
+ <string name="total_classes">Total Classes</string>
<string-array name="sems">
<item>1</item>
Index: app/src/main/res/drawable/ic_calendar.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/drawable/ic_calendar.xml (date 1597489578257)
+++ app/src/main/res/drawable/ic_calendar.xml (date 1597489578257)
@@ -0,0 +1,29 @@
+<vector android:height="60dp" android:viewportHeight="511"
+ android:viewportWidth="512" android:width="60dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#d0f4ef" android:pathData="m458.586,457.195h-447.211c-6.836,0 -12.371,-5.543 -12.371,-12.375v-367.73c0,-21.68 17.57,-39.25 39.25,-39.25h393.453c21.676,0 39.25,17.57 39.25,39.25v367.73c0,6.836 -5.539,12.375 -12.371,12.375zM458.586,457.195"/>
+ <path android:fillColor="#abe0da" android:pathData="m470.953,77.094v367.723c0,6.836 -5.531,12.379 -12.367,12.379h-37.527c6.832,0 12.375,-5.543 12.375,-12.379v-367.723c0,-21.688 -17.574,-39.25 -39.25,-39.25h37.531c21.672,0 39.238,17.563 39.238,39.25zM470.953,77.094"/>
+ <path android:fillColor="#f72b2b" android:pathData="m470.953,77.094v60.027h-471.953v-60.027c0,-21.688 17.578,-39.25 39.262,-39.25h393.453c21.672,0 39.238,17.563 39.238,39.25zM470.953,77.094"/>
+ <path android:fillColor="#d61b1f" android:pathData="m470.953,77.094v60.027h-37.52v-60.027c0,-21.688 -17.574,-39.25 -39.25,-39.25h37.531c21.672,0 39.238,17.563 39.238,39.25zM470.953,77.094"/>
+ <path android:fillColor="#628fb1" android:pathData="m78.488,182.84h-26.852c-4.27,0 -7.727,-3.461 -7.727,-7.727s3.457,-7.727 7.727,-7.727h26.852c4.27,0 7.727,3.461 7.727,7.727s-3.457,7.727 -7.727,7.727zM78.488,182.84"/>
+ <path android:fillColor="#628fb1" android:pathData="m161.023,182.84h-26.855c-4.266,0 -7.727,-3.461 -7.727,-7.727s3.461,-7.727 7.727,-7.727h26.855c4.266,0 7.727,3.461 7.727,7.727s-3.461,7.727 -7.727,7.727zM161.023,182.84"/>
+ <path android:fillColor="#628fb1" android:pathData="m243.555,182.84h-26.855c-4.266,0 -7.723,-3.461 -7.723,-7.727s3.457,-7.727 7.723,-7.727h26.855c4.27,0 7.727,3.461 7.727,7.727s-3.457,7.727 -7.727,7.727zM243.555,182.84"/>
+ <path android:fillColor="#628fb1" android:pathData="m326.09,182.84h-26.855c-4.266,0 -7.727,-3.461 -7.727,-7.727s3.461,-7.727 7.727,-7.727h26.855c4.266,0 7.727,3.461 7.727,7.727s-3.461,7.727 -7.727,7.727zM326.09,182.84"/>
+ <path android:fillColor="#628fb1" android:pathData="m408.621,182.84h-26.852c-4.27,0 -7.727,-3.461 -7.727,-7.727s3.457,-7.727 7.727,-7.727h26.852c4.27,0 7.727,3.461 7.727,7.727s-3.457,7.727 -7.727,7.727zM408.621,182.84"/>
+ <path android:fillColor="#628fb1" android:pathData="m78.488,221.691h-26.852c-4.27,0 -7.727,-3.461 -7.727,-7.727s3.457,-7.727 7.727,-7.727h26.852c4.27,0 7.727,3.461 7.727,7.727s-3.457,7.727 -7.727,7.727zM78.488,221.691"/>
+ <path android:fillColor="#628fb1" android:pathData="m161.023,221.691h-26.855c-4.266,0 -7.727,-3.461 -7.727,-7.727s3.461,-7.727 7.727,-7.727h26.855c4.266,0 7.727,3.461 7.727,7.727s-3.461,7.727 -7.727,7.727zM161.023,221.691"/>
+ <path android:fillColor="#628fb1" android:pathData="m243.555,221.691h-26.855c-4.266,0 -7.723,-3.461 -7.723,-7.727s3.457,-7.727 7.723,-7.727h26.855c4.27,0 7.727,3.461 7.727,7.727s-3.457,7.727 -7.727,7.727zM243.555,221.691"/>
+ <path android:fillColor="#628fb1" android:pathData="m326.09,221.691h-26.855c-4.266,0 -7.727,-3.461 -7.727,-7.727s3.461,-7.727 7.727,-7.727h26.855c4.266,0 7.727,3.461 7.727,7.727s-3.461,7.727 -7.727,7.727zM326.09,221.691"/>
+ <path android:fillColor="#628fb1" android:pathData="m408.621,221.691h-26.852c-4.27,0 -7.727,-3.461 -7.727,-7.727s3.457,-7.727 7.727,-7.727h26.852c4.27,0 7.727,3.461 7.727,7.727s-3.457,7.727 -7.727,7.727zM408.621,221.691"/>
+ <path android:fillColor="#f72b2b" android:pathData="m195.598,414.281c-5.809,0 -11.621,-2.215 -16.051,-6.648l-39.727,-39.727c-8.867,-8.863 -8.867,-23.234 0,-32.102 8.863,-8.863 23.238,-8.863 32.102,0l23.676,23.676 92.738,-92.742c8.867,-8.859 23.238,-8.863 32.102,0 8.867,8.867 8.867,23.238 0,32.105l-108.789,108.789c-4.434,4.434 -10.242,6.648 -16.051,6.648zM195.598,414.281"/>
+ <path android:fillColor="#ffbd47" android:pathData="m83.285,69.121h-14.352c-6.098,0 -11.043,-4.941 -11.043,-11.043v-37.539c0,-6.098 4.945,-11.039 11.043,-11.039h14.352c6.098,0 11.043,4.941 11.043,11.039v37.539c0,6.102 -4.945,11.043 -11.043,11.043zM83.285,69.121"/>
+ <path android:fillColor="#ffbd47" android:pathData="m186.418,69.121h-14.355c-6.098,0 -11.039,-4.941 -11.039,-11.043v-37.539c0,-6.098 4.941,-11.039 11.039,-11.039h14.355c6.098,0 11.039,4.941 11.039,11.039v37.539c0,6.102 -4.941,11.043 -11.039,11.043zM186.418,69.121"/>
+ <path android:fillColor="#ffbd47" android:pathData="m289.551,69.121h-14.355c-6.098,0 -11.039,-4.941 -11.039,-11.043v-37.539c0,-6.098 4.941,-11.039 11.039,-11.039h14.355c6.098,0 11.039,4.941 11.039,11.039v37.539c0,6.102 -4.945,11.043 -11.039,11.043zM289.551,69.121"/>
+ <path android:fillColor="#ffbd47" android:pathData="m392.68,69.121h-14.352c-6.098,0 -11.043,-4.941 -11.043,-11.043v-37.539c0,-6.098 4.945,-11.039 11.043,-11.039h14.352c6.098,0 11.043,4.941 11.043,11.039v37.539c0,6.102 -4.945,11.043 -11.043,11.043zM392.68,69.121"/>
+ <path android:fillColor="#38aaff" android:pathData="m511,407.863c0,52.348 -42.434,94.781 -94.781,94.781s-94.781,-42.434 -94.781,-94.781c0,-52.344 42.434,-94.777 94.781,-94.777s94.781,42.434 94.781,94.777zM511,407.863"/>
+ <path android:fillColor="#d0f4ef" android:pathData="m484.383,407.863c0,37.648 -30.52,68.164 -68.164,68.164s-68.164,-30.516 -68.164,-68.164c0,-37.645 30.52,-68.16 68.164,-68.16s68.164,30.516 68.164,68.16zM484.383,407.863"/>
+ <path android:fillColor="#628fb1" android:pathData="m416.219,368.398c-4.266,0 -7.727,-3.457 -7.727,-7.727v-9.41c0,-4.266 3.461,-7.727 7.727,-7.727s7.727,3.461 7.727,7.727v9.41c0,4.27 -3.461,7.727 -7.727,7.727zM416.219,368.398"/>
+ <path android:fillColor="#628fb1" android:pathData="m416.219,472.195c-4.266,0 -7.727,-3.461 -7.727,-7.727v-9.41c0,-4.27 3.461,-7.727 7.727,-7.727s7.727,3.457 7.727,7.727v9.41c0,4.266 -3.461,7.727 -7.727,7.727zM416.219,472.195"/>
+ <path android:fillColor="#628fb1" android:pathData="m472.82,415.59h-9.41c-4.266,0 -7.727,-3.457 -7.727,-7.727 0,-4.266 3.461,-7.723 7.727,-7.723h9.41c4.27,0 7.727,3.457 7.727,7.723 0,4.27 -3.457,7.727 -7.727,7.727zM472.82,415.59"/>
+ <path android:fillColor="#ffbd47" android:pathData="m433.25,415.59h-17.031c-4.266,0 -7.727,-3.457 -7.727,-7.727v-15.648c0,-4.27 3.461,-7.727 7.727,-7.727s7.727,3.461 7.727,7.727v7.926h9.301c4.27,0 7.727,3.457 7.727,7.723 0,4.27 -3.457,7.727 -7.723,7.727zM433.25,415.59"/>
+ <path android:fillColor="#628fb1" android:pathData="m369.027,415.59h-9.41c-4.27,0 -7.727,-3.457 -7.727,-7.727 0,-4.266 3.457,-7.723 7.727,-7.723h9.41c4.266,0 7.727,3.457 7.727,7.723 0,4.27 -3.461,7.727 -7.727,7.727zM369.027,415.59"/>
+</vector>
Index: app/src/main/AndroidManifest.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/AndroidManifest.xml (revision ed423c7768b2f2bea0380dea5e8711975ba29d0c)
+++ app/src/main/AndroidManifest.xml (date 1597491696899)
@@ -9,7 +9,9 @@
android:roundIcon="@mipmap/imsc_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
- <activity android:name=".GPA_Calculation"></activity>
+ <activity android:name=".about_us"></activity>
+ <activity android:name=".Attendance_Calculator" />
+ <activity android:name=".GPA_Calculation" />
<activity android:name=".Physics_PPS" />
<activity android:name=".Physics_PE_IV" />
<activity android:name=".Physics_PE_III" />
Index: app/src/main/java/com/example/imscbit/about_us.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/imscbit/about_us.kt (date 1597490751993)
+++ app/src/main/java/com/example/imscbit/about_us.kt (date 1597490751993)
@@ -0,0 +1,11 @@
+package com.example.imscbit
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class about_us : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_about_us)
+ }
+}
\ No newline at end of file
Index: app/src/main/res/layout/activity_about_us.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/layout/activity_about_us.xml (date 1597491697042)
+++ app/src/main/res/layout/activity_about_us.xml (date 1597491697042)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".about_us">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file