Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Cleanup] Cleanup build.gradle files, update dependencies etc
- cleanup gradle files - remove unnecessary stuff - move code from kotlin package to java package because we don't need to care about sourceSet - change versions.gradle to dependencies.gradle, refactor it and use it in other gradle files - update dependencies - fix some lint/sonar warnings
- Loading branch information
1 parent
3945cc7
commit 0d1c07e
Showing
31 changed files
with
298 additions
and
342 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,60 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| tools:context="org.notests.rxfeedbackexample.counter.Counter"> | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:filterTouchesWhenObscured="true" | ||
| tools:ignore="HardcodedText" | ||
| tools:context="org.notests.rxfeedbackexample.counter.Counter"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/minus" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:background="@android:color/transparent" | ||
| android:text="-" | ||
| android:textSize="32sp" | ||
| android:textColor="@drawable/button" | ||
| android:clickable="true" | ||
| android:paddingStart="16dp" | ||
| android:paddingEnd="16dp" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintEnd_toStartOf="@+id/label" | ||
| app:layout_constraintHorizontal_chainStyle="packed" /> | ||
| <TextView | ||
| android:id="@+id/minus" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:background="@android:color/transparent" | ||
| android:text="-" | ||
| android:textSize="32sp" | ||
| android:textColor="@drawable/button" | ||
| android:clickable="true" | ||
| android:focusable="true" | ||
| android:paddingStart="16dp" | ||
| android:paddingEnd="16dp" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintEnd_toStartOf="@+id/label" | ||
| app:layout_constraintHorizontal_chainStyle="packed" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/label" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textSize="32sp" | ||
| android:padding="8dp" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginEnd="16dp" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintStart_toEndOf="@id/minus" | ||
| app:layout_constraintEnd_toStartOf="@+id/plus" | ||
| tools:text="0" /> | ||
| <TextView | ||
| android:id="@+id/label" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textSize="32sp" | ||
| android:padding="8dp" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginEnd="16dp" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintStart_toEndOf="@id/minus" | ||
| app:layout_constraintEnd_toStartOf="@+id/plus" | ||
| tools:text="0" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/plus" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:background="@android:color/transparent" | ||
| android:text="+" | ||
| android:textSize="32sp" | ||
| android:paddingStart="16dp" | ||
| android:paddingEnd="16dp" | ||
| android:textColor="@drawable/button" | ||
| android:clickable="true" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintStart_toEndOf="@id/label" | ||
| app:layout_constraintEnd_toEndOf="parent" /> | ||
| <TextView | ||
| android:id="@+id/plus" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:background="@android:color/transparent" | ||
| android:text="+" | ||
| android:textSize="32sp" | ||
| android:paddingStart="16dp" | ||
| android:paddingEnd="16dp" | ||
| android:textColor="@drawable/button" | ||
| android:clickable="true" | ||
| android:focusable="true" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintStart_toEndOf="@id/label" | ||
| app:layout_constraintEnd_toEndOf="parent" /> | ||
|
|
||
| </android.support.constraint.ConstraintLayout> |
65 changes: 18 additions & 47 deletions
65
app/src/main/res/layout/activity_github_paginated_search.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,23 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:orientation="vertical"> | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:filterTouchesWhenObscured="true" | ||
| android:orientation="vertical"> | ||
|
|
||
| <android.support.v7.widget.SearchView | ||
| android:id="@+id/searchView" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="48dp" | ||
| android:layout_margin="8dp" | ||
| app:queryHint="Search repositories" /> | ||
| <android.support.v7.widget.SearchView | ||
| android:id="@+id/searchView" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="48dp" | ||
| android:layout_margin="8dp" | ||
| app:queryHint="Search repositories" /> | ||
|
|
||
| <android.support.v7.widget.RecyclerView | ||
| android:id="@+id/recyclerview" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:layout_below="@id/searchView" | ||
| android:paddingEnd="8dp" | ||
| android:paddingStart="8dp" /> | ||
|
|
||
| <!--<LinearLayout--> | ||
| <!--android:id="@+id/bottomContainer"--> | ||
| <!--android:layout_width="match_parent"--> | ||
| <!--android:layout_height="150dp"--> | ||
| <!--android:layout_alignParentBottom="true"--> | ||
| <!--android:background="#555555"--> | ||
| <!--android:orientation="vertical">--> | ||
|
|
||
| <!--<TextView--> | ||
| <!--android:layout_width="match_parent"--> | ||
| <!--android:layout_height="wrap_content"--> | ||
| <!--android:layout_marginEnd="10dp"--> | ||
| <!--android:layout_marginStart="10dp"--> | ||
| <!--android:layout_marginTop="10dp"--> | ||
| <!--android:text="Machine queries, effects 'UI'"--> | ||
| <!--android:textColor="@android:color/white" />--> | ||
|
|
||
| <!--<TextView--> | ||
| <!--android:id="@+id/nextPageUrl"--> | ||
| <!--android:layout_width="match_parent"--> | ||
| <!--android:layout_height="wrap_content"--> | ||
| <!--android:layout_marginEnd="10dp"--> | ||
| <!--android:layout_marginStart="10dp"--> | ||
| <!--android:layout_marginTop="10dp"--> | ||
| <!--android:text="URL"--> | ||
| <!--android:textAlignment="center"--> | ||
| <!--android:textColor="@android:color/white" />--> | ||
|
|
||
| <!--</LinearLayout>--> | ||
| <android.support.v7.widget.RecyclerView | ||
| android:id="@+id/recyclerview" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:layout_below="@id/searchView" | ||
| android:paddingEnd="8dp" | ||
| android:paddingStart="8dp" /> | ||
| </RelativeLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <android.support.v7.widget.RecyclerView android:id="@+id/recyclerview" | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| tools:context="org.notests.rxfeedbackexample.MainActivity" /> | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:filterTouchesWhenObscured="true" | ||
| tools:context="org.notests.rxfeedbackexample.MainActivity" /> |
Oops, something went wrong.