Skip to content

Commit 0375a98

Browse files
TalbotGoodayTalbotGooday
committed
Initial
1 parent 8766279 commit 0375a98

File tree

8 files changed

+67
-46
lines changed

8 files changed

+67
-46
lines changed

‎app/src/main/java/com/gapps/videonoapi/MainActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class MainActivity : AppCompatActivity() {
2020
setContentView(R.layout.activity_main)
2121

2222
initService()
23-
text.setOnClickListener { getPreview(it) }
2423
youtube.setOnClickListener { getPreview(it) }
2524
youtube_music.setOnClickListener { getPreview(it) }
2625
vimeo.setOnClickListener { getPreview(it) }

‎app/src/main/res/drawable-xxhdpi/rutube.png

11.5 KB
Loading

‎app/src/main/res/drawable-xxhdpi/vimeo.png

13 KB
Loading

‎app/src/main/res/drawable-xxhdpi/youtube.png

19.8 KB
Loading

‎app/src/main/res/drawable-xxhdpi/youtube_music.png

11.5 KB
Loading

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

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,57 @@
55
android:layout_height="match_parent"
66
android:gravity="center"
77
android:orientation="vertical"
8-
android:padding="20dp"
8+
android:padding="10dp"
99
tools:context=".MainActivity">
1010

11-
<TextView
12-
android:id="@+id/youtube"
13-
android:layout_width="wrap_content"
14-
android:layout_height="wrap_content"
15-
android:layout_gravity="center"
16-
android:gravity="center"
17-
android:text="https://www.youtube.com/watch?v=DjsPqBzxSG4"
18-
android:textSize="18sp" />
11+
<LinearLayout style="@style/Item">
1912

20-
<TextView
21-
android:id="@+id/youtube_music"
22-
android:layout_width="wrap_content"
23-
android:layout_height="wrap_content"
24-
android:layout_gravity="center"
25-
android:gravity="center"
26-
android:text="https://music.youtube.com/watch?v=lFMOYjVCLUo"
27-
android:textSize="18sp" />
13+
<androidx.appcompat.widget.AppCompatImageView
14+
style="@style/ItemIcon"
15+
android:src="@drawable/youtube" />
2816

29-
<TextView
30-
android:id="@+id/vimeo"
31-
android:layout_width="wrap_content"
32-
android:layout_height="wrap_content"
33-
android:layout_gravity="center"
34-
android:layout_marginTop="10dp"
35-
android:gravity="center"
36-
android:text="https://vimeo.com/333257472"
37-
android:textSize="18sp" />
17+
<TextView
18+
android:id="@+id/youtube"
19+
style="@style/ItemText"
20+
android:text="https://www.youtube.com/watch?v=dQw4w9WgXcQ" />
3821

22+
</LinearLayout>
3923

40-
<TextView
41-
android:id="@+id/rutube"
42-
android:layout_width="wrap_content"
43-
android:gravity="center"
44-
android:layout_height="wrap_content"
45-
android:layout_gravity="center"
46-
android:layout_marginTop="10dp"
47-
android:text="http://rutube.ru/video/ca8607cd4f7ef28516e043dde0068564/"
48-
android:textSize="18sp" />
24+
<LinearLayout style="@style/Item">
4925

50-
<TextView
51-
android:id="@+id/text"
52-
android:layout_width="wrap_content"
53-
android:gravity="center"
54-
android:layout_height="wrap_content"
55-
android:layout_gravity="center"
56-
android:layout_marginTop="10dp"
57-
android:text="Тыць"
58-
android:textSize="18sp" />
26+
<androidx.appcompat.widget.AppCompatImageView
27+
style="@style/ItemIcon"
28+
android:src="@drawable/youtube_music" />
29+
30+
<TextView
31+
android:id="@+id/youtube_music"
32+
style="@style/ItemText"
33+
android:text="https://music.youtube.com/watch?v=lFMOYjVCLUo" />
34+
</LinearLayout>
35+
36+
<LinearLayout style="@style/Item">
37+
38+
<androidx.appcompat.widget.AppCompatImageView
39+
style="@style/ItemIcon"
40+
android:src="@drawable/vimeo" />
41+
42+
<TextView
43+
android:id="@+id/vimeo"
44+
style="@style/ItemText"
45+
android:text="https://vimeo.com/333257472" />
46+
</LinearLayout>
47+
48+
<LinearLayout style="@style/Item">
49+
50+
<androidx.appcompat.widget.AppCompatImageView
51+
style="@style/ItemIcon"
52+
android:src="@drawable/rutube" />
53+
54+
<TextView
55+
android:id="@+id/rutube"
56+
style="@style/ItemText"
57+
android:text="https://rutube.ru/video/d70e62b44b8893e98e3e90a6e2c9fcd4/?pl_type=source&amp;pl_id=18265" />
58+
</LinearLayout>
5959

6060
<ProgressBar
6161
android:id="@+id/progress"

‎app/src/main/res/values/styles.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,27 @@
1616
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
1717

1818
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
19+
<style name="Item">
20+
<item name="android:layout_width">match_parent</item>
21+
<item name="android:layout_height">48dp</item>
22+
<item name="android:gravity">center_vertical</item>
23+
<item name="background">?selectableItemBackground</item>
24+
<item name="android:orientation">horizontal</item>
25+
</style>
26+
<style name="ItemText">
27+
<item name="android:textSize">14sp</item>
28+
<item name="android:textColor">#2F3C47</item>
29+
<item name="android:layout_width">match_parent</item>
30+
<item name="android:layout_height">wrap_content</item>
31+
<item name="android:maxLines">1</item>
32+
<item name="android:ellipsize">end</item>
33+
<item name="android:gravity">center_vertical</item>
34+
<item name="android:layout_marginStart">8dp</item>
35+
</style>
36+
<style name="ItemIcon">
37+
<item name="android:layout_marginEnd">4dp</item>
38+
<item name="android:layout_width">24dp</item>
39+
<item name="android:layout_height">24dp</item>
40+
</style>
1941

2042
</resources>

‎library/src/main/java/com/gapps/library/api/Const.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.gapps.library.api
33
const val YOUTUBE_PATTERN = "(http(s)?:\\/\\/)?((w){3}.)?(m.)?(music.)?youtu(be|.be)?(\\.com)?\\/.+"
44
const val YOUTUBE_PATTERN_ID = "(?:(?:\\w*.?://)?\\w*.?\\w*-?.?\\w*/(?:embed|e|v|watch|.*/)?\\??(?:feature=\\w*\\.?\\w*)?&?(?:v=)?/?)([\\w\\d_-]+).*"
55
const val VIMEO_PATTERN = "(?:http[s]?:\\/\\/)(?:w{3})?(?:player\\.)?vimeo\\.com\\/(?:[a-z]*\\/)*([0-9]{6,11})[?]?.*"
6-
const val RUTUBE_PATTERN = "(?:http[s]?:\\/\\/)(?:w{3})?(?:player\\.)?rutube\\.ru\\/video\\/(?:embed\\/)?([A-Za-z0-9]+)\\/?"
6+
const val RUTUBE_PATTERN = "(?:http[s]?:\\/\\/)(?:w{3})?(?:player\\.)?rutube\\.ru\\/video\\/(?:embed\\/)?([A-Za-z0-9]+)[\\/]?(\\?.+)?"
77
const val OEMBED_INFO = "/oembed"
88
const val VIMEO_INFO = "/api/v2/video/"
99
const val YOUTUBE_BASE_URL = "https://www.youtube.com"

0 commit comments

Comments
 (0)