Skip to content

Commit

Permalink
Vmovie updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Vane101 committed Nov 30, 2015
1 parent 6159491 commit a88787b
Show file tree
Hide file tree
Showing 64 changed files with 2,695 additions and 473 deletions.
16 changes: 11 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 22
compileSdkVersion 23
buildToolsVersion "22.0.1"

defaultConfig {
applicationId "za.co.ubiquitech.vmovies"
minSdkVersion 17
targetSdkVersion 22
minSdkVersion 19
targetSdkVersion 23
versionCode 1
versionName "1.0"
}
Expand All @@ -24,8 +24,14 @@ repositories {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.2.1'

compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.inthecheesefactory.thecheeselibrary:stated-fragment-support-v4:0.9.3'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.squareup.retrofit:retrofit:2.0.0-beta1'

compile 'com.android.support:design:23.0.1'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:support-v4:23.0.1'
compile 'com.android.support:cardview-v7:23.0.1'
compile 'com.facebook.stetho:stetho:1.2.0'
}
25 changes: 18 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,32 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="za.co.ubiquitech.vmovies">
package="za.co.ubiquitech.vmovies" >

<!-- Required Permissions -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme" >
<activity
android:name=".MainActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:launchMode="singleTop"
android:noHistory="false">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".MovieDetailActivity"
android:label="Review">
android:name=".DetailActivity"
android:parentActivityName=".MainActivity"
android:label="Review"
android:launchMode="singleTop"
android:noHistory="false">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity" />
</activity>

<activity android:name=".util.MoviePreferenceActivity"/>
<activity android:name=".util.MoviePreferenceActivity" />
<provider
android:authorities="@string/content_authority"
android:name=".database.MoviesProvider"
android:exported="false"
android:syncable="true"/>
</application>

</manifest>
Binary file added app/src/main/ic_calendar-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/ic_calender-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/ic_star-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/ic_white_star-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions app/src/main/java/za/co/ubiquitech/vmovies/DetailActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package za.co.ubiquitech.vmovies;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

public class DetailActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_movie_detail);
if (savedInstanceState == null) {
Bundle arguments = new Bundle();
arguments.putParcelable(DetailFragment.DETAIL_MOVIE, getIntent().getParcelableExtra(DetailFragment.DETAIL_MOVIE));
DetailFragment fragment = new DetailFragment();
fragment.setArguments(arguments);
getSupportFragmentManager().beginTransaction()
.add(R.id.movie_detail_container, fragment)
.commit();
}
}
}
Loading

0 comments on commit a88787b

Please sign in to comment.