Skip to content

Commit c06a921

Browse files
denisvieiradevdenisvieiradev
authored
Merge branch 'main' into Devpass_Settings
2 parents 8a89ff7 + 0f912d0 commit c06a921

File tree

12 files changed

+94
-6
lines changed

12 files changed

+94
-6
lines changed

‎solutions/devsprint-denis-vieira-2/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88

99
defaultConfig {
1010
applicationId "com.devpass.githubapp"
11-
minSdk 30
11+
minSdk 28
1212
targetSdk 31
1313
versionCode 1
1414
versionName "1.0"

‎solutions/devsprint-denis-vieira-2/app/src/main/java/com/devpass/githubapp/presentation/RepositoryListActivity.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ package com.devpass.githubapp.presentation
22

33
import android.os.Bundle
44
import android.util.Log
5+
import android.view.Menu
6+
import android.widget.SearchView
57
import androidx.appcompat.app.AppCompatActivity
68
import androidx.navigation.ui.AppBarConfiguration
79
import android.widget.Toast
10+
import com.devpass.githubapp.R
811
import com.devpass.githubapp.data.api.GitHubEndpoint
912
import com.devpass.githubapp.data.model.Repository
1013
import com.devpass.githubapp.databinding.ActivityMainBinding
@@ -25,6 +28,7 @@ class RepositoryListActivity : AppCompatActivity() {
2528
setContentView(binding.root)
2629

2730
setSupportActionBar(binding.toolbar)
31+
binding.toolbar
2832

2933
val retrofitClient = NetworkUtils.getRetrofitInstance("https://api.github.com")
3034
val endpoint = retrofitClient.create(GitHubEndpoint::class.java)
@@ -42,4 +46,10 @@ class RepositoryListActivity : AppCompatActivity() {
4246
})
4347
}
4448

49+
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
50+
menuInflater.inflate(R.menu.menu_main, menu)
51+
52+
return super.onCreateOptionsMenu(menu)
53+
}
54+
4555
}

‎solutions/devsprint-denis-vieira-2/app/src/main/res/drawable/devpass_logo.png

7.4 KB
Loading

‎solutions/devsprint-denis-vieira-2/app/src/main/res/drawable/ic_search.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="18dp"
3+
android:height="18dp"
4+
android:viewportWidth="18"
5+
android:viewportHeight="18">
6+
<path
7+
android:pathData="M12.5,11H11.71L11.43,10.73C12.41,9.59 13,8.11 13,6.5C13,2.91 10.09,0 6.5,0C2.91,0 0,2.91 0,6.5C0,10.09 2.91,13 6.5,13C8.11,13 9.59,12.41 10.73,11.43L11,11.71V12.5L16,17.49L17.49,16L12.5,11ZM6.5,11C4.01,11 2,8.99 2,6.5C2,4.01 4.01,2 6.5,2C8.99,2 11,4.01 11,6.5C11,8.99 8.99,11 6.5,11Z"
8+
android:fillColor="#ffffff"
9+
android:fillType="evenOdd"/>
10+
</vector>

‎solutions/devsprint-denis-vieira-2/app/src/main/res/layout/activity_main.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,15 @@
1616
android:layout_width="match_parent"
1717
android:layout_height="?attr/actionBarSize"
1818
android:background="?attr/colorPrimary"
19-
app:popupTheme="@style/Theme.GitHubApp.PopupOverlay" />
19+
app:title="@string/repositories"
20+
app:popupTheme="@style/Theme.GitHubApp.PopupOverlay">
21+
<ImageView
22+
android:src="@drawable/ic_search"
23+
android:layout_width="17.49dp"
24+
android:layout_height="17.49dp"
25+
android:layout_gravity="end"/>
26+
27+
</androidx.appcompat.widget.Toolbar>
2028

2129
</com.google.android.material.appbar.AppBarLayout>
2230

‎solutions/devsprint-denis-vieira-2/app/src/main/res/layout/repository_cell_item.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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=".presentation.RepositoryCellItem">
8+
9+
<com.google.android.material.imageview.ShapeableImageView
10+
android:id="@+id/image"
11+
android:layout_width="40dp"
12+
android:layout_height="40dp"
13+
android:src="@drawable/devpass_logo"
14+
android:layout_marginStart="20dp"
15+
android:layout_marginTop="28dp"
16+
app:layout_constraintStart_toStartOf="parent"
17+
app:layout_constraintTop_toTopOf="parent"
18+
app:shapeAppearanceOverlay="@style/Circular"
19+
/>
20+
21+
<TextView
22+
android:id="@+id/title"
23+
android:layout_width="wrap_content"
24+
android:layout_height="wrap_content"
25+
android:layout_marginStart="12dp"
26+
android:layout_marginTop="24dp"
27+
android:textColor="@color/black_02"
28+
app:layout_constraintStart_toEndOf="@id/image"
29+
app:layout_constraintTop_toTopOf="parent"
30+
android:textStyle="bold"
31+
android:text="@string/title"
32+
/>
33+
34+
<TextView
35+
android:id="@+id/subtitle"
36+
android:layout_width="wrap_content"
37+
android:layout_height="wrap_content"
38+
android:layout_marginStart="12dp"
39+
android:text="@string/subtitle"
40+
android:textColor="#616161"
41+
app:layout_constraintStart_toEndOf="@id/image"
42+
app:layout_constraintTop_toBottomOf="@id/title" />
43+
44+
</androidx.constraintlayout.widget.ConstraintLayout>

‎solutions/devsprint-denis-vieira-2/app/src/main/res/menu/menu_main.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
xmlns:app="http://schemas.android.com/apk/res-auto"
33
xmlns:tools="http://schemas.android.com/tools"
44
tools:context="com.devpass.githubapp.presentation.RepositoryListActivity">
5+
56
<item
67
android:id="@+id/action_settings"
78
android:orderInCategory="100"

‎solutions/devsprint-denis-vieira-2/app/src/main/res/values/colors.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@
77
<color name="teal_700">#FF018786</color>
88
<color name="black">#FF000000</color>
99
<color name="white">#FFFFFFFF</color>
10+
11+
<color name="gray">#757575</color>
12+
<color name="black_02">#212121</color>
13+
1014
<color name="devpass_blue">#FF5084C1</color>
1115
</resources>

‎solutions/devsprint-denis-vieira-2/app/src/main/res/values/custom_profile_photo.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="Circular">
4+
<item name="cornerSize">50%</item>
5+
</style>
6+
</resources>

‎solutions/devsprint-denis-vieira-2/app/src/main/res/values/strings.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<resources>
22
<string name="app_name">GitHubApp</string>
3+
<string name="repositories">Repositories</string>
34
<string name="action_settings">Settings</string>
45
<string name="first_fragment_label">GitHubApp</string>
56
<string name="hello_first_fragment">Hello, Devpass!</string>
@@ -8,10 +9,14 @@
89
<string name="next">Next</string>
910
<string name="previous">Previous</string>
1011
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
12+
1113
<string name="title_activity_settings">SettingsActivity</string>
1214
<string name="app_information">App Information</string>
1315
<string name="version">Version</string>
1416
<string name="build">Build</string>
1517
<string name="_55">55</string>
1618
<string name="_1_0_0">1.0.0</string>
19+
20+
<string name="title">challenge-github-app</string>
21+
<string name="subtitle">devpass-tech</string>
1722
</resources>

0 commit comments

Comments
 (0)