Skip to content

Commit 8b6cd91

Browse files
75py75py
authored
Merge pull request #9 from 75py/publish_on_google_play
Publish on google play(0.2.0)
2 parents 85868c4 + 5bf5e63 commit 8b6cd91

25 files changed

Lines changed: 101 additions & 233 deletions

‎library/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ android {
2727
defaultConfig {
2828
minSdkVersion 16
2929
targetSdkVersion 26
30-
versionCode 1
31-
versionName "0.0.0"
30+
versionCode publish_version_code
31+
versionName publish_version_name
3232

3333
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3434
consumerProguardFiles 'proguard-rules.pro'

‎sample/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ android {
2323
applicationId 'com.nagopy.android.overlayviewmanager.sample'
2424
minSdkVersion 16
2525
targetSdkVersion 26
26-
versionCode 1
27-
versionName "1.0.0"
26+
versionCode publish_version_code
27+
versionName publish_version_name
2828
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2929
}
3030
buildTypes {

‎sample/src/main/AndroidManifest.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,18 @@
3838
<category android:name="android.intent.category.LAUNCHER" />
3939
</intent-filter>
4040
</activity>
41-
<activity android:name=".SampleAllOptionsActivity" />
42-
<activity android:name=".Sample1Activity" />
43-
<activity android:name=".Sample2Activity" />
44-
<activity android:name=".SampleTimberActivity" />
41+
<activity
42+
android:name=".SampleAllOptionsActivity"
43+
android:label="@string/title_sample_all_options" />
44+
<activity
45+
android:name=".Sample1Activity"
46+
android:label="@string/title_sample1_clickable_draggable" />
47+
<activity
48+
android:name=".Sample2Activity"
49+
android:label="@string/title_sample2_depends_on_service" />
50+
<activity
51+
android:name=".SampleTimberActivity"
52+
android:label="@string/title_sample3_timber_depends_on_activity" />
4553

4654
<service android:name=".Sample2Activity$Sample2Service" />
4755
</application>

‎sample/src/main/ic_launcher-web.png‎

21.6 KB
Loading

‎sample/src/main/res/drawable/ic_launcher_background.xml‎

Lines changed: 70 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -1,186 +1,74 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
~ Copyright 2017 75py
4-
~
5-
~ Licensed under the Apache License, Version 2.0 (the "License");
6-
~ you may not use this file except in compliance with the License.
7-
~ You may obtain a copy of the License at
8-
~
9-
~ http://www.apache.org/licenses/LICENSE-2.0
10-
~
11-
~ Unless required by applicable law or agreed to in writing, software
12-
~ distributed under the License is distributed on an "AS IS" BASIS,
13-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
~ See the License for the specific language governing permissions and
15-
~ limitations under the License.
16-
-->
17-
18-
<vector xmlns:android="http://schemas.android.com/apk/res/android"
19-
android:width="108dp"
2+
<vector
203
android:height="108dp"
4+
android:width="108dp"
215
android:viewportHeight="108"
22-
android:viewportWidth="108">
23-
<path
24-
android:fillColor="#26A69A"
25-
android:pathData="M0,0h108v108h-108z" />
26-
<path
27-
android:fillColor="#00000000"
28-
android:pathData="M9,0L9,108"
29-
android:strokeColor="#33FFFFFF"
30-
android:strokeWidth="0.8" />
31-
<path
32-
android:fillColor="#00000000"
33-
android:pathData="M19,0L19,108"
34-
android:strokeColor="#33FFFFFF"
35-
android:strokeWidth="0.8" />
36-
<path
37-
android:fillColor="#00000000"
38-
android:pathData="M29,0L29,108"
39-
android:strokeColor="#33FFFFFF"
40-
android:strokeWidth="0.8" />
41-
<path
42-
android:fillColor="#00000000"
43-
android:pathData="M39,0L39,108"
44-
android:strokeColor="#33FFFFFF"
45-
android:strokeWidth="0.8" />
46-
<path
47-
android:fillColor="#00000000"
48-
android:pathData="M49,0L49,108"
49-
android:strokeColor="#33FFFFFF"
50-
android:strokeWidth="0.8" />
51-
<path
52-
android:fillColor="#00000000"
53-
android:pathData="M59,0L59,108"
54-
android:strokeColor="#33FFFFFF"
55-
android:strokeWidth="0.8" />
56-
<path
57-
android:fillColor="#00000000"
58-
android:pathData="M69,0L69,108"
59-
android:strokeColor="#33FFFFFF"
60-
android:strokeWidth="0.8" />
61-
<path
62-
android:fillColor="#00000000"
63-
android:pathData="M79,0L79,108"
64-
android:strokeColor="#33FFFFFF"
65-
android:strokeWidth="0.8" />
66-
<path
67-
android:fillColor="#00000000"
68-
android:pathData="M89,0L89,108"
69-
android:strokeColor="#33FFFFFF"
70-
android:strokeWidth="0.8" />
71-
<path
72-
android:fillColor="#00000000"
73-
android:pathData="M99,0L99,108"
74-
android:strokeColor="#33FFFFFF"
75-
android:strokeWidth="0.8" />
76-
<path
77-
android:fillColor="#00000000"
78-
android:pathData="M0,9L108,9"
79-
android:strokeColor="#33FFFFFF"
80-
android:strokeWidth="0.8" />
81-
<path
82-
android:fillColor="#00000000"
83-
android:pathData="M0,19L108,19"
84-
android:strokeColor="#33FFFFFF"
85-
android:strokeWidth="0.8" />
86-
<path
87-
android:fillColor="#00000000"
88-
android:pathData="M0,29L108,29"
89-
android:strokeColor="#33FFFFFF"
90-
android:strokeWidth="0.8" />
91-
<path
92-
android:fillColor="#00000000"
93-
android:pathData="M0,39L108,39"
94-
android:strokeColor="#33FFFFFF"
95-
android:strokeWidth="0.8" />
96-
<path
97-
android:fillColor="#00000000"
98-
android:pathData="M0,49L108,49"
99-
android:strokeColor="#33FFFFFF"
100-
android:strokeWidth="0.8" />
101-
<path
102-
android:fillColor="#00000000"
103-
android:pathData="M0,59L108,59"
104-
android:strokeColor="#33FFFFFF"
105-
android:strokeWidth="0.8" />
106-
<path
107-
android:fillColor="#00000000"
108-
android:pathData="M0,69L108,69"
109-
android:strokeColor="#33FFFFFF"
110-
android:strokeWidth="0.8" />
111-
<path
112-
android:fillColor="#00000000"
113-
android:pathData="M0,79L108,79"
114-
android:strokeColor="#33FFFFFF"
115-
android:strokeWidth="0.8" />
116-
<path
117-
android:fillColor="#00000000"
118-
android:pathData="M0,89L108,89"
119-
android:strokeColor="#33FFFFFF"
120-
android:strokeWidth="0.8" />
121-
<path
122-
android:fillColor="#00000000"
123-
android:pathData="M0,99L108,99"
124-
android:strokeColor="#33FFFFFF"
125-
android:strokeWidth="0.8" />
126-
<path
127-
android:fillColor="#00000000"
128-
android:pathData="M19,29L89,29"
129-
android:strokeColor="#33FFFFFF"
130-
android:strokeWidth="0.8" />
131-
<path
132-
android:fillColor="#00000000"
133-
android:pathData="M19,39L89,39"
134-
android:strokeColor="#33FFFFFF"
135-
android:strokeWidth="0.8" />
136-
<path
137-
android:fillColor="#00000000"
138-
android:pathData="M19,49L89,49"
139-
android:strokeColor="#33FFFFFF"
140-
android:strokeWidth="0.8" />
141-
<path
142-
android:fillColor="#00000000"
143-
android:pathData="M19,59L89,59"
144-
android:strokeColor="#33FFFFFF"
145-
android:strokeWidth="0.8" />
146-
<path
147-
android:fillColor="#00000000"
148-
android:pathData="M19,69L89,69"
149-
android:strokeColor="#33FFFFFF"
150-
android:strokeWidth="0.8" />
151-
<path
152-
android:fillColor="#00000000"
153-
android:pathData="M19,79L89,79"
154-
android:strokeColor="#33FFFFFF"
155-
android:strokeWidth="0.8" />
156-
<path
157-
android:fillColor="#00000000"
158-
android:pathData="M29,19L29,89"
159-
android:strokeColor="#33FFFFFF"
160-
android:strokeWidth="0.8" />
161-
<path
162-
android:fillColor="#00000000"
163-
android:pathData="M39,19L39,89"
164-
android:strokeColor="#33FFFFFF"
165-
android:strokeWidth="0.8" />
166-
<path
167-
android:fillColor="#00000000"
168-
android:pathData="M49,19L49,89"
169-
android:strokeColor="#33FFFFFF"
170-
android:strokeWidth="0.8" />
171-
<path
172-
android:fillColor="#00000000"
173-
android:pathData="M59,19L59,89"
174-
android:strokeColor="#33FFFFFF"
175-
android:strokeWidth="0.8" />
176-
<path
177-
android:fillColor="#00000000"
178-
android:pathData="M69,19L69,89"
179-
android:strokeColor="#33FFFFFF"
180-
android:strokeWidth="0.8" />
181-
<path
182-
android:fillColor="#00000000"
183-
android:pathData="M79,19L79,89"
184-
android:strokeColor="#33FFFFFF"
185-
android:strokeWidth="0.8" />
6+
android:viewportWidth="108"
7+
xmlns:android="http://schemas.android.com/apk/res/android">
8+
<path android:fillColor="#26A69A"
9+
android:pathData="M0,0h108v108h-108z"/>
10+
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
11+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
12+
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
13+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
14+
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
15+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
16+
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
17+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
18+
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
19+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
20+
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
21+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
22+
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
23+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
24+
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
25+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
26+
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
27+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
28+
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
29+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
30+
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
31+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
32+
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
33+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
34+
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
35+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
36+
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
37+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
38+
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
39+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
40+
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
41+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
42+
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
43+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
44+
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
45+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
46+
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
47+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
48+
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
49+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
50+
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
51+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
52+
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
53+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
54+
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
55+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
56+
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
57+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
58+
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
59+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
60+
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
61+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
62+
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
63+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
64+
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
65+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
66+
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
67+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
68+
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
69+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
70+
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
71+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
72+
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
73+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
18674
</vector>

‎sample/src/main/res/layout/activity_sample_start.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,29 @@
5454
android:layout_width="match_parent"
5555
android:layout_height="wrap_content"
5656
android:onClick="onClick"
57-
android:text="SAMPLE(All options)" />
57+
android:text="@string/title_sample_all_options" />
5858

5959
<Button
6060
android:id="@+id/btn_sample1"
6161
android:layout_width="match_parent"
6262
android:layout_height="wrap_content"
6363
android:onClick="onClick"
64-
android:text="SAMPLE1(Clickable, Draggable)" />
64+
android:text="@string/title_sample1_clickable_draggable" />
6565

6666
<Button
6767
android:id="@+id/btn_sample2"
6868
android:layout_width="match_parent"
6969
android:layout_height="wrap_content"
7070
android:enabled="@{canDrawOverlays}"
7171
android:onClick="onClick"
72-
android:text="SAMPLE2(depends on Service)" />
72+
android:text="@string/title_sample2_depends_on_service" />
7373

7474
<Button
7575
android:id="@+id/btn_sample_timber"
7676
android:layout_width="match_parent"
7777
android:layout_height="wrap_content"
7878
android:onClick="onClick"
79-
android:text="SAMPLE3(Timber, depends on Activity)" />
79+
android:text="@string/title_sample3_timber_depends_on_activity" />
8080

8181

8282
</LinearLayout>

‎sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
~ Copyright 2017 75py
4-
~
5-
~ Licensed under the Apache License, Version 2.0 (the "License");
6-
~ you may not use this file except in compliance with the License.
7-
~ You may obtain a copy of the License at
8-
~
9-
~ http://www.apache.org/licenses/LICENSE-2.0
10-
~
11-
~ Unless required by applicable law or agreed to in writing, software
12-
~ distributed under the License is distributed on an "AS IS" BASIS,
13-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
~ See the License for the specific language governing permissions and
15-
~ limitations under the License.
16-
-->
17-
182
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
19-
<background android:drawable="@drawable/ic_launcher_background" />
20-
<foreground android:drawable="@drawable/ic_launcher_foreground" />
3+
<background android:drawable="@drawable/ic_launcher_background"/>
4+
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
215
</adaptive-icon>

‎sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
~ Copyright 2017 75py
4-
~
5-
~ Licensed under the Apache License, Version 2.0 (the "License");
6-
~ you may not use this file except in compliance with the License.
7-
~ You may obtain a copy of the License at
8-
~
9-
~ http://www.apache.org/licenses/LICENSE-2.0
10-
~
11-
~ Unless required by applicable law or agreed to in writing, software
12-
~ distributed under the License is distributed on an "AS IS" BASIS,
13-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
~ See the License for the specific language governing permissions and
15-
~ limitations under the License.
16-
-->
17-
182
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
19-
<background android:drawable="@drawable/ic_launcher_background" />
20-
<foreground android:drawable="@drawable/ic_launcher_foreground" />
3+
<background android:drawable="@drawable/ic_launcher_background"/>
4+
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
215
</adaptive-icon>

‎sample/src/main/res/mipmap-hdpi/ic_launcher.png‎

-600 Bytes
Loading

‎sample/src/main/res/mipmap-hdpi/ic_launcher_foreground.png‎

1.18 KB
Loading

0 commit comments

Comments
 (0)