Skip to content

Commit c84a64b

Browse files
Ruthik27Ruthik27
committed
done with data entry of origin and website
1 parent 715db5f commit c84a64b

File tree

9 files changed

+80
-28
lines changed

9 files changed

+80
-28
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,28 @@
33
package="com.example.firebase01">
44

55
<uses-permission android:name="android.permission.INTERNET" />
6-
7-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
8-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
6+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
7+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
98

109
<application
11-
android:usesCleartextTraffic="true"
1210
android:allowBackup="true"
1311
android:icon="@mipmap/ic_launcher"
1412
android:label="@string/app_name"
1513
android:roundIcon="@mipmap/ic_launcher_round"
1614
android:supportsRtl="true"
17-
android:theme="@style/AppTheme">
15+
android:theme="@style/AppTheme"
16+
android:usesCleartextTraffic="true">
17+
<activity android:name=".ScreenSplash">
18+
<intent-filter>
19+
<action android:name="android.intent.action.MAIN" />
1820

19-
<meta-data android:name="com.google.android.geo.API_KEY"
20-
android:value="@string/map_key"/>
21+
<category android:name="android.intent.category.LAUNCHER" />
22+
</intent-filter>
23+
</activity>
24+
25+
<meta-data
26+
android:name="com.google.android.geo.API_KEY"
27+
android:value="@string/map_key" />
2128

2229
<activity android:name=".BaseActivity">
2330
<intent-filter>
@@ -26,17 +33,14 @@
2633
<category android:name="android.intent.category.DEFAULT" />
2734
</intent-filter>
2835
</activity>
29-
30-
<activity android:name=".MapActivity"></activity>
31-
36+
<activity android:name=".MapActivity" />
3237
<activity android:name=".GoogleSignInActivity">
3338
<intent-filter>
3439
<action android:name="android.intent.action.MAIN" />
3540

36-
<category android:name="android.intent.category.LAUNCHER"/>
41+
<category android:name="android.intent.category.LAUNCHER" />
3742
</intent-filter>
3843
</activity>
39-
4044
</application>
4145

4246
</manifest>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void onMapReady(GoogleMap googleMap) {
8888
map=googleMap;
8989

9090
for (int i=0;i<arrayList.size();i++){
91-
map.addMarker(new MarkerOptions().position(arrayList.get(i)).title("Marker"));
91+
map.addMarker(new MarkerOptions().position(arrayList.get(i)).title(String.valueOf(arrayList)));
9292
map.animateCamera(CameraUpdateFactory.zoomTo(15.0f));
9393
map.moveCamera(CameraUpdateFactory.newLatLng(arrayList.get(i)));
9494
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.example.firebase01;
2+
3+
import android.content.Intent;
4+
import android.os.Bundle;
5+
6+
import androidx.annotation.Nullable;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
9+
public class ScreenSplash extends AppCompatActivity {
10+
@Override
11+
protected void onCreate(@Nullable Bundle savedInstanceState) {
12+
super.onCreate(savedInstanceState);
13+
14+
startActivity(new Intent(this,GoogleSignInActivity.class));
15+
}
16+
}

‎app/src/main/res/drawable/background_screen_splash.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:drawable="@color/white"/>
4+
<item>
5+
<bitmap android:src="@drawable/logoapp"
6+
android:gravity="center"/>
7+
</item>
8+
9+
</layer-list>

‎app/src/main/res/drawable/logoapp.jpg‎

33.1 KB
Loading

‎app/src/main/res/layout/activity_screen_splash.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
tools:context=".ScreenSplash">
8+
9+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/fragment_infofragment.xml‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,55 @@
1313
<TextView
1414
android:layout_width="wrap_content"
1515
android:layout_height="wrap_content"
16-
android:layout_marginTop="10dp"
16+
android:layout_marginTop="150dp"
17+
android:layout_gravity="center"
1718
android:id="@+id/titleholder"
1819
android:text="Title here"
1920
android:textSize="25dp"
2021
android:textStyle="bold"
2122
android:textColor="#000"/>
2223

2324
<TextView
25+
android:id="@+id/aaholder"
2426
android:layout_width="wrap_content"
2527
android:layout_height="wrap_content"
26-
android:layout_marginTop="10dp"
27-
android:id="@+id/aaholder"
28+
android:layout_gravity="center"
29+
android:layout_marginLeft="10dp"
30+
android:layout_marginTop="30dp"
31+
android:layout_marginRight="10dp"
32+
android:gravity="center"
2833
android:text="source 1"
34+
android:textColor="#000"
2935
android:textSize="25dp"
30-
android:textStyle="bold"
31-
android:textColor="#000"/>
36+
android:textStyle="bold" />
3237

3338
<TextView
39+
android:id="@+id/abholder"
3440
android:layout_width="wrap_content"
3541
android:layout_height="wrap_content"
42+
android:layout_gravity="center_horizontal"
43+
android:layout_marginLeft="10dp"
3644
android:layout_marginTop="10dp"
37-
android:id="@+id/abholder"
45+
android:layout_marginRight="10dp"
46+
android:gravity="center"
3847
android:text="source 2"
48+
android:textColor="#000"
3949
android:textSize="25dp"
40-
android:textStyle="bold"
41-
android:textColor="#000"/>
50+
android:textStyle="bold" />
4251

4352
<TextView
53+
android:id="@+id/acholder"
4454
android:layout_width="wrap_content"
4555
android:layout_height="wrap_content"
56+
android:layout_gravity="center_horizontal"
57+
android:layout_marginLeft="10dp"
4658
android:layout_marginTop="10dp"
47-
android:id="@+id/acholder"
59+
android:layout_marginRight="10dp"
60+
android:gravity="center"
4861
android:text="source 3"
62+
android:textColor="#000"
4963
android:textSize="25dp"
50-
android:textStyle="bold"
51-
android:textColor="#000"/>
64+
android:textStyle="bold" />
5265

5366

5467

‎app/src/main/res/layout/singleroedesign2.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<TextView
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
20+
android:layout_centerInParent="true"
2021
android:id="@+id/titletext"
2122
android:text="Text is Demo name to start"
2223
android:textStyle="bold"

‎app/src/main/res/layout/singlerowdesign.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:id="@+id/nametext"
2626
android:text="Text is Brand name"
2727
android:textStyle="bold"
28-
android:textSize="25dp"
28+
android:textSize="30dp"
2929
android:textColor="#000"
3030
android:layout_toRightOf="@+id/img1"
3131
android:layout_marginLeft="10dp"/>
@@ -35,8 +35,8 @@
3535
android:layout_height="wrap_content"
3636
android:id="@+id/origintext"
3737
android:text="Text is Origin name"
38-
android:textStyle="bold"
39-
android:textSize="25dp"
38+
android:textStyle="italic"
39+
android:textSize="20dp"
4040
android:textColor="#000"
4141
android:layout_toRightOf="@+id/img1"
4242
android:layout_below="@+id/nametext"
@@ -47,7 +47,7 @@
4747
android:layout_height="wrap_content"
4848
android:id="@+id/emailtext"
4949
android:text="Text is Email name"
50-
android:textSize="25dp"
50+
android:textSize="15dp"
5151
android:textColor="#000"
5252
android:layout_toRightOf="@+id/img1"
5353
android:layout_below="@+id/origintext"

0 commit comments

Comments
 (0)