Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/build.gradle
#	app/src/main/res/values/arrays.xml
  • Loading branch information
bogdanorzea committed May 3, 2018
2 parents 8c8a664 + 69ff52a commit c5a907d
Show file tree
Hide file tree
Showing 100 changed files with 3,470 additions and 1,063 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018 Bogdan Orzea

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# PopularMovies
Project Submission for Android Developer Nanodegree Program.
This app starts with a list of movie covers. Clicking on one cover will open a new activity with additional details.

## Usage
In order to compile this app add an API key to gradle.properties. More details are available on [The Movie Database API](https://developers.themoviedb.org/3/) guide.

## Libraries
* [Timber](https://github.com/JakeWharton/timber)
* [Picasso](http://square.github.io/picasso/)
* [Moshi](https://github.com/square/moshi)
* [okHttp](http://square.github.io/okhttp/)

## Credits
Icons made by [Freepik](http://www.freepik.com) from [Flaticon](www.flaticon.com) are licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)

## License
See [LICENSE](./LICENSE) for details.
18 changes: 13 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,26 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:appcompat-v7:27.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:recyclerview-v7:27.0.2'
implementation 'com.android.support:design:27.0.2'
implementation 'com.android.support:preference-v14:27.0.2'
implementation 'com.android.support:recyclerview-v7:27.1.0'
implementation 'com.android.support:design:27.1.0'
implementation 'com.android.support:preference-v14:27.1.0'
implementation 'com.android.support:cardview-v7:27.1.0'
implementation 'com.android.support:customtabs:27.1.0'

// Test Libraries
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

// Square libraries
// Libraries
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
implementation 'com.squareup.moshi:moshi:1.5.0'
implementation 'com.serjltt.moshi:moshi-lazy-adapters:2.1'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.jakewharton.timber:timber:4.6.1'

// Animations
implementation 'com.wang.avi:library:2.1.3'
}
25 changes: 16 additions & 9 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,45 @@
<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".PopularMovies"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:launchMode="singleTop">
android:name=".ui.MainActivity"
android:launchMode="singleTop"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".DetailsActivity"
android:label="@string/title_activity_details"
android:parentActivityName=".MainActivity"
android:name=".ui.DetailsActivity"
android:label=""
android:parentActivityName=".ui.MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.bogdanorzea.popularmovies.MainActivity" />
android:value="com.bogdanorzea.popularmovies.ui.MainActivity" />
</activity>
<activity
android:name=".SettingsActivity"
android:name=".ui.SettingsActivity"
android:label="@string/title_activity_settings"
android:parentActivityName=".MainActivity">
android:parentActivityName=".ui.MainActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.bogdanorzea.popularmovies.MainActivity" />
android:value="com.bogdanorzea.popularmovies.ui.MainActivity" />
</activity>

<provider
android:name=".data.MovieProvider"
android:authorities="com.bogdanorzea.popularmovies"
android:exported="false" />
</application>

</manifest>
72 changes: 0 additions & 72 deletions app/src/main/java/com/bogdanorzea/popularmovies/CoverAdapter.java

This file was deleted.

Loading

0 comments on commit c5a907d

Please sign in to comment.