Skip to content

Commit 34e163e

Browse files
author
fengpeng
committed
v1.0
0 parents  commit 34e163e

File tree

41 files changed

+1331
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1331
-0
lines changed

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
*.iml
2+
gradle/
3+
.gradle
4+
/local.properties
5+
/.idea/
6+
/build
7+
/captures
8+
.externalNativeBuild
9+
.cxx
10+
local.properties

‎app/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎app/build.gradle‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
plugins {
2+
id 'com.android.application'
3+
id 'kotlin-android'
4+
}
5+
6+
android {
7+
compileSdkVersion 28
8+
buildToolsVersion "29.0.3"
9+
10+
defaultConfig {
11+
applicationId "com.pizzk.overlay.app"
12+
minSdkVersion 16
13+
targetSdkVersion 28
14+
versionCode 1
15+
versionName "1.0"
16+
17+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
18+
}
19+
20+
buildTypes {
21+
release {
22+
minifyEnabled false
23+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
24+
}
25+
}
26+
compileOptions {
27+
sourceCompatibility JavaVersion.VERSION_1_8
28+
targetCompatibility JavaVersion.VERSION_1_8
29+
}
30+
kotlinOptions {
31+
jvmTarget = '1.8'
32+
}
33+
}
34+
35+
dependencies {
36+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
37+
implementation 'androidx.core:core-ktx:1.3.2'
38+
implementation 'androidx.appcompat:appcompat:1.2.0'
39+
implementation 'com.google.android.material:material:1.2.1'
40+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
41+
testImplementation 'junit:junit:4.+'
42+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
43+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
44+
implementation project(":lib")
45+
}

‎app/proguard-rules.pro‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

‎app/src/androidTest/java/com/pizzk/overlay/app/ExampleInstrumentedTest.kt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.pizzk.overlay.app
2+
3+
import androidx.test.platform.app.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
6+
import org.junit.Test
7+
import org.junit.runner.RunWith
8+
9+
import org.junit.Assert.*
10+
11+
/**
12+
* Instrumented test, which will execute on an Android device.
13+
*
14+
* See [testing documentation](http://d.android.com/tools/testing).
15+
*/
16+
@RunWith(AndroidJUnit4::class)
17+
class ExampleInstrumentedTest {
18+
@Test
19+
fun useAppContext() {
20+
// Context of the app under test.
21+
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22+
assertEquals("com.pizzk.guidehelper.app", appContext.packageName)
23+
}
24+
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.pizzk.overlay.app">
4+
5+
<application
6+
android:allowBackup="false"
7+
android:icon="@mipmap/ic_launcher"
8+
android:label="@string/app_name"
9+
android:supportsRtl="true"
10+
android:theme="@style/Theme.GuideHelper">
11+
<activity android:name=".MainActivity">
12+
<intent-filter>
13+
<action android:name="android.intent.action.MAIN" />
14+
15+
<category android:name="android.intent.category.LAUNCHER" />
16+
</intent-filter>
17+
</activity>
18+
</application>
19+
20+
</manifest>

‎app/src/main/java/com/pizzk/overlay/app/MainActivity.kt‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
package com.pizzk.overlay.app
2+
3+
import androidx.appcompat.app.AppCompatActivity
4+
import android.os.Bundle
5+
import android.view.View
6+
import android.widget.Toast
7+
import androidx.constraintlayout.widget.ConstraintSet
8+
import com.pizzk.overlay.*
9+
import com.pizzk.overlay.el.Anchor
10+
import com.pizzk.overlay.el.Marker
11+
import com.pizzk.overlay.el.Overlay
12+
13+
class MainActivity : AppCompatActivity() {
14+
private val adapter: OverlayAdapter = OverlayAdapter()
15+
16+
override fun onCreate(savedInstanceState: Bundle?) {
17+
super.onCreate(savedInstanceState)
18+
setContentView(R.layout.activity_main)
19+
val vOverlay: OverlayLayout = findViewById(R.id.vOverlay)
20+
vOverlay.setMaskColor(R.color.overlay_mask)
21+
vOverlay.setVisibility(false)
22+
adapter.with(vOverlay)
23+
findViewById<View>(R.id.tv1).setOnClickListener {
24+
Toast.makeText(baseContext, "TV1 clicked", Toast.LENGTH_SHORT).show()
25+
buildMultiOverlay()
26+
adapter.next()
27+
}
28+
findViewById<View>(R.id.tv2).setOnClickListener {
29+
Toast.makeText(baseContext, "TV2 clicked", Toast.LENGTH_SHORT).show()
30+
buildMultiAnchor()
31+
adapter.next()
32+
}
33+
}
34+
35+
private fun buildMultiOverlay() {
36+
val overlay1 = Overlay.Builder()
37+
.anchor(Anchor.rect(R.id.tv1, radius = 10, inset = 10))
38+
.marker(R.layout.tv1_marker)
39+
.build()
40+
overlay1.marker(R.layout.tv1_marker, m1Layout)
41+
val overlay2 = Overlay.Builder()
42+
.anchor(Anchor.circle(R.id.tv2, inset = 30))
43+
.marker(R.layout.tv2_marker)
44+
.build()
45+
overlay2.marker(R.layout.tv2_marker, m2Layout)
46+
adapter.overlays(listOf(overlay1, overlay2))
47+
}
48+
49+
private fun buildMultiAnchor() {
50+
val overlay = Overlay.Builder()
51+
.anchor(Anchor.rect(R.id.tv1, radius = 10, inset = 5))
52+
.marker(R.layout.tv1_marker)
53+
.anchor(Anchor.circle(R.id.tv2, inset = 20))
54+
.marker(R.layout.tv2_marker)
55+
.build()
56+
overlay.marker(R.layout.tv1_marker, m1Layout)
57+
overlay.marker(R.layout.tv2_marker, m2Layout)
58+
adapter.overlays(listOf(overlay))
59+
}
60+
61+
private val m1Layout: Marker.MarkerLayout = object : Marker.MarkerLayout() {
62+
override fun onLayout(cs: ConstraintSet, marker: View, anchor: View) {
63+
super.onLayout(cs, marker, anchor)
64+
connect(ConstraintSet.START)
65+
connect(ConstraintSet.END)
66+
connect(ConstraintSet.TOP, ConstraintSet.BOTTOM, 20)
67+
setClickListener(R.id.btNext) { adapter.next() }
68+
}
69+
}
70+
71+
private val m2Layout: Marker.MarkerLayout = object : Marker.MarkerLayout() {
72+
override fun onLayout(cs: ConstraintSet, marker: View, anchor: View) {
73+
super.onLayout(cs, marker, anchor)
74+
connect(ConstraintSet.START)
75+
connect(ConstraintSet.END)
76+
connect(ConstraintSet.TOP, ConstraintSet.BOTTOM, 20)
77+
setParentClickListener { adapter.next() }
78+
}
79+
}
80+
}

‎app/src/main/res/drawable-v24/ic_launcher_foreground.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
8+
<aapt:attr name="android:fillColor">
9+
<gradient
10+
android:endX="85.84757"
11+
android:endY="92.4963"
12+
android:startX="42.9492"
13+
android:startY="49.59793"
14+
android:type="linear">
15+
<item
16+
android:color="#44000000"
17+
android:offset="0.0" />
18+
<item
19+
android:color="#00000000"
20+
android:offset="1.0" />
21+
</gradient>
22+
</aapt:attr>
23+
</path>
24+
<path
25+
android:fillColor="#FFFFFF"
26+
android:fillType="nonZero"
27+
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
28+
android:strokeWidth="1"
29+
android:strokeColor="#00000000" />
30+
</vector>

0 commit comments

Comments
 (0)