Skip to content

Commit 1748a53

Browse files
arifBurakDemirayarifBurakDemiray
committed
feat: pull changes from the module content
1 parent 66a36bc commit 1748a53

File tree

10 files changed

+279
-313
lines changed

10 files changed

+279
-313
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
android:label="@string/activity_name_feedback"
102102
android:configChanges="orientation|screenSize"/>
103103

104-
<activity
105-
android:name=".ActivityExampleTransparentActivity"
106-
android:label="@string/activity_name_feedback"
107-
android:configChanges="orientation|screenSize"/>
108-
109104
<activity
110105
android:name=".ActivityExampleTests"
111106
android:exported="false"/>

‎app/src/main/java/ly/count/android/demo/ActivityExampleOthers.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package ly.count.android.demo;
22

33
import android.app.Activity;
4-
import android.content.Intent;
54
import android.os.Bundle;
65
import android.util.Log;
76
import android.view.View;
@@ -138,8 +137,4 @@ public void onClickUpdateSession(View v) {
138137
public void onClickEndSession(View v) {
139138
Countly.sharedInstance().sessions().endSession();
140139
}
141-
142-
public void onClickTransparentActivity(View v) {
143-
startActivity(new Intent(this, ActivityExampleTransparentActivity.class));
144-
}
145140
}

‎app/src/main/java/ly/count/android/demo/ActivityExampleTransparentActivity.java‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,5 @@
126126
android:onClick="onClickEndSession"
127127
android:text="End Session"
128128
/>
129-
<Button
130-
android:id="@+id/button74"
131-
android:layout_width="match_parent"
132-
android:layout_height="wrap_content"
133-
android:onClick="onClickTransparentActivity"
134-
android:text="Transparent Activity"
135-
/>
136-
137129
</LinearLayout>
138130
</ScrollView>

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

Lines changed: 0 additions & 64 deletions
This file was deleted.

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

Lines changed: 106 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,120 @@
1-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
3-
android:layout_width="match_parent"
4-
android:layout_height="match_parent"
5-
android:paddingLeft="@dimen/activity_horizontal_margin"
6-
android:paddingRight="@dimen/activity_horizontal_margin"
7-
android:paddingTop="@dimen/activity_vertical_margin"
8-
android:paddingBottom="@dimen/activity_vertical_margin"
9-
tools:context=".MainActivity"
10-
>
11-
12-
<LinearLayout
13-
android:orientation="vertical"
14-
android:layout_width="match_parent"
15-
android:layout_height="wrap_content"
16-
android:layout_centerVertical="true"
17-
android:layout_centerHorizontal="true"
18-
tools:ignore="UselessParent"
19-
>
1+
<ScrollView android:layout_width="match_parent" android:layout_height="match_parent" xmlns:android="http://schemas.android.com/apk/res/android">
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:paddingLeft="@dimen/activity_horizontal_margin"
7+
android:paddingRight="@dimen/activity_horizontal_margin"
8+
android:paddingTop="@dimen/activity_vertical_margin"
9+
android:paddingBottom="@dimen/activity_vertical_margin"
10+
tools:context=".MainActivity"
11+
>
2012

21-
<Button
22-
android:text="@string/custom_events"
13+
<LinearLayout
14+
android:orientation="vertical"
2315
android:layout_width="match_parent"
2416
android:layout_height="wrap_content"
25-
android:id="@+id/button9"
26-
android:onClick="onClickButtonCustomEvents"
27-
/>
17+
android:layout_centerVertical="true"
18+
android:layout_centerHorizontal="true"
19+
tools:ignore="UselessParent"
20+
>
2821

29-
<Button
30-
android:text="@string/crash_reporting"
31-
android:layout_width="match_parent"
32-
android:layout_height="wrap_content"
33-
android:id="@+id/button8"
34-
android:onClick="onClickButtonCrashReporting"
35-
/>
22+
<Button
23+
android:text="@string/custom_events"
24+
android:layout_width="match_parent"
25+
android:layout_height="wrap_content"
26+
android:id="@+id/button9"
27+
android:onClick="onClickButtonCustomEvents"
28+
/>
3629

37-
<Button
38-
android:text="@string/user_details"
39-
android:layout_width="match_parent"
40-
android:layout_height="wrap_content"
41-
android:id="@+id/button7"
42-
android:onClick="onClickButtonUserDetails"
43-
/>
30+
<Button
31+
android:text="@string/crash_reporting"
32+
android:layout_width="match_parent"
33+
android:layout_height="wrap_content"
34+
android:id="@+id/button8"
35+
android:onClick="onClickButtonCrashReporting"
36+
/>
4437

45-
<Button
46-
android:text="@string/apm"
47-
android:layout_width="match_parent"
48-
android:layout_height="wrap_content"
49-
android:id="@+id/button6"
50-
android:onClick="onClickButtonAPM"
51-
/>
38+
<Button
39+
android:text="@string/user_details"
40+
android:layout_width="match_parent"
41+
android:layout_height="wrap_content"
42+
android:id="@+id/button7"
43+
android:onClick="onClickButtonUserDetails"
44+
/>
5245

53-
<Button
54-
android:text="@string/view_tracking"
55-
android:layout_width="match_parent"
56-
android:layout_height="wrap_content"
57-
android:id="@+id/button5"
58-
android:onClick="onClickButtonViewTracking"
59-
/>
46+
<Button
47+
android:text="@string/apm"
48+
android:layout_width="match_parent"
49+
android:layout_height="wrap_content"
50+
android:id="@+id/button6"
51+
android:onClick="onClickButtonAPM"
52+
/>
6053

61-
<Button
62-
android:id="@+id/auto_view"
63-
android:layout_width="match_parent"
64-
android:layout_height="wrap_content"
65-
android:onClick="onClickButtonAutoViewTracking"
66-
android:text="Auto View Tracking"
67-
/>
68-
<Button
69-
android:text="@string/multi_threading"
70-
android:layout_width="match_parent"
71-
android:layout_height="wrap_content"
72-
android:id="@+id/button3"
73-
android:enabled="false"
74-
android:onClick="onClickButtonMultiThreading"
75-
/>
54+
<Button
55+
android:text="@string/view_tracking"
56+
android:layout_width="match_parent"
57+
android:layout_height="wrap_content"
58+
android:id="@+id/button5"
59+
android:onClick="onClickButtonViewTracking"
60+
/>
7661

77-
<Button
78-
android:id="@+id/button52"
79-
android:layout_width="match_parent"
80-
android:layout_height="wrap_content"
81-
android:onClick="onClickButtonRemoteConfig"
82-
android:text="Remote Config"
83-
/>
62+
<Button
63+
android:id="@+id/auto_view"
64+
android:layout_width="match_parent"
65+
android:layout_height="wrap_content"
66+
android:onClick="onClickButtonAutoViewTracking"
67+
android:text="Auto View Tracking"
68+
/>
69+
<Button
70+
android:text="@string/multi_threading"
71+
android:layout_width="match_parent"
72+
android:layout_height="wrap_content"
73+
android:id="@+id/button3"
74+
android:enabled="false"
75+
android:onClick="onClickButtonMultiThreading"
76+
/>
8477

85-
<Button
86-
android:id="@+id/button59"
87-
android:layout_width="match_parent"
88-
android:layout_height="wrap_content"
89-
android:onClick="onClickButtonDeviceId"
90-
android:text="Device ID"
91-
/>
78+
<Button
79+
android:id="@+id/button52"
80+
android:layout_width="match_parent"
81+
android:layout_height="wrap_content"
82+
android:onClick="onClickButtonRemoteConfig"
83+
android:text="Remote Config"
84+
/>
9285

93-
<Button
94-
android:id="@+id/button70"
95-
android:layout_width="match_parent"
96-
android:layout_height="wrap_content"
97-
android:onClick="onClickButtonRatings"
98-
android:text="Surveys and Ratings"
99-
/>
86+
<Button
87+
android:id="@+id/button59"
88+
android:layout_width="match_parent"
89+
android:layout_height="wrap_content"
90+
android:onClick="onClickButtonDeviceId"
91+
android:text="Device ID"
92+
/>
10093

101-
<Button
102-
android:text="@string/others"
103-
android:layout_width="match_parent"
104-
android:layout_height="wrap_content"
105-
android:id="@+id/button2"
106-
android:onClick="onClickButtonOthers"
107-
/>
94+
<Button
95+
android:id="@+id/button70"
96+
android:layout_width="match_parent"
97+
android:layout_height="wrap_content"
98+
android:onClick="onClickButtonRatings"
99+
android:text="Surveys and Ratings"
100+
/>
108101

109-
<Button
110-
android:id="@+id/tests_button"
111-
android:layout_width="match_parent"
112-
android:layout_height="wrap_content"
113-
android:onClick="onClickButtonTests"
114-
android:text="Tests"
115-
/>
102+
<Button
103+
android:text="@string/others"
104+
android:layout_width="match_parent"
105+
android:layout_height="wrap_content"
106+
android:id="@+id/button2"
107+
android:onClick="onClickButtonOthers"
108+
/>
109+
110+
<Button
111+
android:id="@+id/tests_button"
112+
android:layout_width="match_parent"
113+
android:layout_height="wrap_content"
114+
android:onClick="onClickButtonTests"
115+
android:text="Tests"
116+
/>
116117

117-
</LinearLayout>
118-
</RelativeLayout>
118+
</LinearLayout>
119+
</RelativeLayout>
120+
</ScrollView>

0 commit comments

Comments
 (0)