Skip to content

Commit 385e8c8

Browse files
Ruthik27Ruthik27
committed
added second last editis
1 parent d83ad91 commit 385e8c8

File tree

13 files changed

+102
-31
lines changed

13 files changed

+102
-31
lines changed

‎app/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ android {
1313
versionName "1.0"
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
16+
17+
vectorDrawables.useSupportLibrary = true
18+
1619
}
1720

1821
buildTypes {

‎app/src/main/java/com/example/firebase01/GoogleSignInActivity.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.os.Bundle;
55
import android.util.Log;
66
import android.view.View;
7-
import android.widget.Button;
7+
import android.widget.ImageButton;
88
import android.widget.TextView;
99
import android.widget.Toast;
1010

@@ -17,8 +17,6 @@
1717
import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
1818
import com.google.android.gms.common.api.ApiException;
1919
import com.google.android.gms.maps.GoogleMap;
20-
import com.google.android.gms.maps.model.LatLng;
21-
import com.google.android.gms.maps.model.MarkerOptions;
2220
import com.google.android.gms.tasks.OnCompleteListener;
2321
import com.google.android.gms.tasks.Task;
2422
import com.google.firebase.auth.AuthCredential;
@@ -39,8 +37,8 @@ public class GoogleSignInActivity extends AppCompatActivity implements
3937
private TextView mStatusTextView;
4038
private TextView mDetailTextView;
4139

42-
public Button database1;
43-
public Button map1;
40+
public ImageButton database1;
41+
public ImageButton map1;
4442

4543
private GoogleMap mMap;
4644

@@ -59,8 +57,8 @@ protected void onCreate(Bundle savedInstanceState) {
5957

6058

6159

62-
database1 = (Button) findViewById(R.id.button6);
63-
map1 = (Button) findViewById(R.id.button7);
60+
database1 = (ImageButton) findViewById(R.id.button6);
61+
map1 = (ImageButton) findViewById(R.id.button7);
6462

6563

6664
database1.setOnClickListener(new View.OnClickListener(){
@@ -185,6 +183,8 @@ private void updateUI(FirebaseUser user) {
185183

186184
findViewById(R.id.signInButton).setVisibility(View.GONE);
187185
findViewById(R.id.signOutAndDisconnect).setVisibility(View.VISIBLE);
186+
findViewById(R.id.signOutButton).setVisibility(View.VISIBLE);
187+
findViewById(R.id.disconnectButton).setVisibility(View.VISIBLE);
188188
findViewById(R.id.button6).setVisibility(View.VISIBLE);
189189
findViewById(R.id.button7).setVisibility(View.VISIBLE);
190190

@@ -220,9 +220,6 @@ public void onClick(View v) {
220220

221221
}
222222

223-
private void setUpMap() {
224-
mMap.addMarker(new MarkerOptions().position(new LatLng(0, 0)).title("Marker"));
225-
}
226223

227224

228225

‎app/src/main/res/drawable-anydpi/ic_data05.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="80dp"
3+
android:height="80dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="#000000"
7+
android:alpha="0.8">
8+
<group android:scaleX="0.119008265"
9+
android:scaleY="0.119008265"
10+
android:translateX="-10.809917"
11+
android:translateY="-5.8512397">
12+
<path
13+
android:pathData="M207.3,101c-6.8,3.2 -12.3,6 -12.3,6.2 0,0.2 4.9,0.2 10.9,-0 11.8,-0.3 14.4,-1.5 15.7,-6.7 0.7,-2.7 0,-5.5 -1.3,-5.4 -0.4,-0 -6.3,2.6 -13,5.9z"
14+
android:fillColor="#000000"
15+
android:strokeColor="#00000000"/>
16+
<path
17+
android:pathData="M248.8,108.2c-3.2,2.7 -4.8,6.3 -4.8,11.1 0,4.1 0.9,6.3 6.1,15 5.8,9.8 6,10.4 5.7,15.9 -0.5,6.3 -3.7,11.7 -8.9,14.3l-2.9,1.6 0,-4.1c0,-5.2 -2.2,-8.6 -6.6,-10 -7.2,-2.4 -14.5,4.7 -12.3,12.2l0.8,2.8 -20.8,-0 -20.9,-0 0.5,-4.3c0.4,-3.6 0.1,-4.8 -2.2,-7.5 -2.2,-2.6 -3.4,-3.2 -6.7,-3.2 -2.1,-0 -4.8,0.5 -5.9,1 -3,1.7 -5.2,6.8 -4.4,10.6 0.5,2.7 0.3,3.4 -1,3.4 -4.7,-0 -10.5,5.9 -10.5,10.8 0,1.8 1.2,2 21.3,2.5 16.6,0.4 22.7,0.9 28.2,2.4 6.7,1.9 16.5,6.3 10.5,4.8 -1.4,-0.4 -5,-1.3 -8,-2.1 -3.7,-0.9 -11.5,-1.4 -24.2,-1.4l-18.7,-0 -1.6,3c-3.3,6.4 -6.8,6 51.3,6 50.8,-0 52.9,-0.1 57.2,-2.1 6.3,-2.8 10.7,-7.4 13,-13.6 2.3,-6.2 2.5,-10.3 0.6,-15.6 -1.6,-4.3 -31.5,-54.7 -32.5,-54.7 -0.4,-0 -1.4,0.6 -2.3,1.2z"
18+
android:fillColor="#000000"
19+
android:strokeColor="#00000000"/>
20+
<path
21+
android:pathData="M145.6,109.8c-0.3,0.5 -2.3,5.8 -4.4,11.8 -2.2,6 -4.6,12.3 -5.5,14 -1.9,3.6 -8.9,10.9 -17.4,18.2 -5.3,4.5 -6.5,6.1 -7.9,10.8 -2.7,9.2 -0.5,16.6 6.6,22.7 6.9,5.9 15.7,6.9 24,2.7 7.5,-3.8 10.7,-9.6 11.3,-20.9 0.6,-8.7 3.6,-16.9 7.8,-20.7 1.1,-1 10,-6.7 19.7,-12.6l17.7,-10.8 17.5,-0c19.5,-0 22.3,-0.8 25.5,-6.9 3.2,-6.3 4.2,-6.1 -25.7,-6.1 -15.1,-0 -29.3,0.5 -31.8,1.1 -2.4,0.5 -8.3,2.7 -13.1,4.7l-8.6,3.6 -1.3,4.9c-1.3,5 -13.7,31.3 -14.5,30.6 -0.2,-0.3 2.1,-7.3 5.1,-15.7 5.8,-16.5 6.6,-21.9 3.6,-26.5 -3.1,-4.6 -7.3,-7 -8.6,-4.9z"
22+
android:fillColor="#000000"
23+
android:strokeColor="#00000000"/>
24+
<path
25+
android:pathData="M189.5,135.1l-8,4.9 20.3,-0c17.2,-0 20.8,-0.3 23.2,-1.7 2.6,-1.5 5,-5 5,-7.3 0,-0.6 -6.6,-1 -16.2,-0.9l-16.3,0.1 -8,4.9z"
26+
android:fillColor="#000000"
27+
android:strokeColor="#00000000"/>
28+
<path
29+
android:pathData="M181,198.9c-1.4,2.7 -1.3,6.1 0.3,6.1 0.6,-0 7.5,-1.8 15.2,-3.9l14,-4 -14.2,-0c-13.1,-0.1 -14.3,0.1 -15.3,1.8z"
30+
android:fillColor="#000000"
31+
android:strokeColor="#00000000"/>
32+
</group>
33+
</vector>

‎app/src/main/res/drawable-anydpi/ic_map05.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="50dp"
3+
android:height="50dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="#000000"
7+
android:alpha="0.8">
8+
<group android:scaleX="0.11857708"
9+
android:scaleY="0.11857708"
10+
android:translateX="-31.636364"
11+
android:translateY="-20.727272">
12+
<path
13+
android:pathData="M356.8,181.1c-8.4,1.2 -20.2,5.4 -28.2,10.1 -8.5,5 -21.8,18 -26.5,26 -11.6,19.9 -14.2,41.8 -7.2,62.8 3.5,10.7 6.9,17.3 9.1,17.8 0.8,0.1 5.9,-4.1 11.3,-9.3 7.3,-7.3 10.3,-9.6 12,-9.3 1.4,0.2 2.3,1.1 2.5,2.7 0.3,1.8 -1.9,4.6 -10.2,13.1 -7.8,7.9 -10.6,11.4 -10.6,13.2 0,2.4 9,17.5 11.4,19 2.6,1.8 4.9,0.2 16.2,-11.2 9.7,-9.8 12.4,-12 14.4,-11.8 1.8,0.2 2.6,1 2.8,2.7 0.3,1.9 -2.1,4.9 -12.1,15 -6.8,6.9 -12.7,13.3 -13,14.2 -0.9,2.6 2.5,7.1 14.5,19.2 11.5,11.6 19.1,16.7 24.8,16.7 13.9,-0 46.3,-36.3 64.8,-72.6 8.4,-16.6 11.3,-26.4 11.9,-39.4 1,-22.1 -6.2,-40.5 -22.2,-56.6 -17.8,-17.8 -41.5,-25.9 -65.7,-22.3zM389.3,219.4c3.9,1.6 24.1,22.1 25.2,25.4 1.8,5.9 0.3,8 -22.6,31.2 -12.1,12.3 -23.2,23.2 -24.7,24.2 -3.3,2.2 -9,2.3 -11.9,0.3 -1.1,-0.8 -6.8,-6.3 -12.7,-12.1 -10.9,-11 -12.7,-14.2 -11.1,-19.6 1,-3.1 45.1,-47.6 49,-49.4 3.8,-1.7 4.9,-1.7 8.8,-0z"
14+
android:fillColor="#000000"
15+
android:strokeColor="#00000000"/>
16+
<path
17+
android:pathData="M357.2,247.3c-6.1,6.2 -11.2,11.6 -11.2,12 0,0.4 1.5,0.7 3.3,0.7 2.8,-0 4.6,-1.3 12.5,-9.3 7.1,-7.1 9.2,-9.9 9.2,-12 0,-1.5 -0.6,-2.7 -1.3,-2.7 -0.7,-0 -6.3,5.1 -12.5,11.3z"
18+
android:fillColor="#000000"
19+
android:strokeColor="#00000000"/>
20+
<path
21+
android:pathData="M374.3,237.6c-0.9,2.5 0.7,4.9 9.1,13.4 6.9,7 8.3,8.1 10.9,7.8 1.7,-0.2 3.2,-0.9 3.5,-1.6 0.5,-1.8 -18.9,-21.2 -21.1,-21.2 -1,-0 -2,0.7 -2.4,1.6z"
22+
android:fillColor="#000000"
23+
android:strokeColor="#00000000"/>
24+
<path
25+
android:pathData="M391.5,263c-1.1,0.4 -5.7,4.6 -10.2,9.3 -6.8,6.9 -8.3,9 -8.3,11.6 0,1.8 0.5,3.1 1.3,3.1 1.5,-0 22.7,-21.1 22.7,-22.7 0,-0.8 -2.5,-2.5 -3.3,-2.2 -0.1,-0 -1.1,0.4 -2.2,0.9z"
26+
android:fillColor="#000000"
27+
android:strokeColor="#00000000"/>
28+
<path
29+
android:pathData="M345.7,264.7c-1.5,1.4 -0.3,3 9.5,12.9 11.2,11.4 13.8,12.7 13.8,6.6 0,-3.4 -0.8,-4.6 -8.3,-12 -6.7,-6.7 -8.8,-8.2 -11.3,-8.2 -1.7,-0 -3.4,0.3 -3.7,0.7z"
30+
android:fillColor="#000000"
31+
android:strokeColor="#00000000"/>
32+
</group>
33+
</vector>

‎app/src/main/res/drawable-hdpi/ic_data05.png‎

408 Bytes
Loading

‎app/src/main/res/drawable-hdpi/ic_map05.png‎

464 Bytes
Loading

‎app/src/main/res/drawable-mdpi/ic_data05.png‎

276 Bytes
Loading

‎app/src/main/res/drawable-mdpi/ic_map05.png‎

321 Bytes
Loading

‎app/src/main/res/drawable-xhdpi/ic_data05.png‎

499 Bytes
Loading

‎app/src/main/res/drawable-xhdpi/ic_map05.png‎

592 Bytes
Loading

0 commit comments

Comments
 (0)