commit b974df9b89c4daf62de1b39399120ef55aef50b6 Author: H Malik Date: Mon Jun 5 20:17:52 2017 +0100 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39fb081 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b0a270f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8ba135a --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..c049b5f --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,29 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion "24.0.3" + defaultConfig { + applicationId "com.example.h_mal.newsapp" + minSdkVersion 15 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.1.0' + testCompile 'junit:junit:4.12' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..05e856b --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\Users\h_mal\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/app/src/androidTest/java/com/example/h_mal/newsapp/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/h_mal/newsapp/ExampleInstrumentedTest.java new file mode 100644 index 0000000..e8c08e1 --- /dev/null +++ b/app/src/androidTest/java/com/example/h_mal/newsapp/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.example.h_mal.newsapp; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.example.h_mal.newsapp", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c83eaea --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/newsapp/DataSink.java b/app/src/main/java/com/example/h_mal/newsapp/DataSink.java new file mode 100644 index 0000000..d0bcbcf --- /dev/null +++ b/app/src/main/java/com/example/h_mal/newsapp/DataSink.java @@ -0,0 +1,145 @@ +package com.example.h_mal.newsapp; + +import android.text.TextUtils; +import android.util.Log; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by h_mal on 16/03/2017. + */ + +public class DataSink { + + private static final String LOG_TAG = DataSink.class.getSimpleName(); + + private DataSink(){} + + public static List fetchNewsData(String requestUrl) { + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + URL url = createUrl(requestUrl); + + String jsonResponse = null; + try { + jsonResponse = makeHttpRequest(url); + } catch (IOException e) { + Log.e(LOG_TAG, "Problem making the HTTP request.", e); + } + + List news = extractFeatureFromJson(jsonResponse); + + return news; + } + + private static URL createUrl(String stringUrl) { + URL url = null; + try { + url = new URL(stringUrl); + } catch (MalformedURLException e) { + Log.e(LOG_TAG, "Error with creating URL ", e); + } + return url; + } + + private static String makeHttpRequest(URL url) throws IOException { + String jsonResponse = ""; + + if (url == null) { + return jsonResponse; + } + + HttpURLConnection urlConnection = null; + InputStream inputStream = null; + try { + urlConnection = (HttpURLConnection) url.openConnection(); + urlConnection.setReadTimeout(10000 /* milliseconds */); + urlConnection.setConnectTimeout(15000 /* milliseconds */); + urlConnection.setRequestMethod("GET"); + urlConnection.connect(); + + if (urlConnection.getResponseCode() == 200) { + inputStream = urlConnection.getInputStream(); + jsonResponse = readFromStream(inputStream); + } else { + Log.e(LOG_TAG, "Error response code: " + urlConnection.getResponseCode()); + } + } catch (IOException e) { + Log.e(LOG_TAG, "Problem retrieving the earthquake JSON results.", e); + } finally { + if (urlConnection != null) { + urlConnection.disconnect(); + } + if (inputStream != null) { + inputStream.close(); + } + } + return jsonResponse; + } + + private static String readFromStream(InputStream inputStream) throws IOException { + StringBuilder output = new StringBuilder(); + if (inputStream != null) { + InputStreamReader inputStreamReader = new InputStreamReader(inputStream, Charset.forName("UTF-8")); + BufferedReader reader = new BufferedReader(inputStreamReader); + String line = reader.readLine(); + while (line != null) { + output.append(line); + line = reader.readLine(); + } + } + return output.toString(); + } + + private static List extractFeatureFromJson(String newsJSON) { + + if (TextUtils.isEmpty(newsJSON)) { + return null; + } + + List news = new ArrayList<>(); + + try { + + JSONObject baseJsonResponse = new JSONObject(newsJSON); + JSONObject currentNews = baseJsonResponse.getJSONObject("response"); + JSONArray newsArray = currentNews.getJSONArray("results"); + + for (int i = 0; i < newsArray.length(); i++) { + JSONObject properties = newsArray.getJSONObject(i); + + String title = properties.getString("webTitle"); + String section = properties.getString("sectionName"); + String url = properties.getString("webUrl"); + + News newsArticles = new News(title, section, url); + + news.add(newsArticles); + } + + } catch (JSONException e) { + + Log.e("DataSink", "Problem parsing the earthquake JSON results", e); + } + + return news; + } + +} diff --git a/app/src/main/java/com/example/h_mal/newsapp/MainActivity.java b/app/src/main/java/com/example/h_mal/newsapp/MainActivity.java new file mode 100644 index 0000000..684f93c --- /dev/null +++ b/app/src/main/java/com/example/h_mal/newsapp/MainActivity.java @@ -0,0 +1,147 @@ +package com.example.h_mal.newsapp; + +import android.app.LoaderManager; +import android.content.Context; +import android.content.Intent; +import android.content.Loader; +import android.content.SharedPreferences; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; +import android.net.Uri; +import android.os.AsyncTask; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.support.v7.app.AppCompatActivity; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ListView; +import android.widget.ProgressBar; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.List; + +public class MainActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks> { + + private TextView mEmptyStateTextView; + + private static final int NEWS_LOADER_ID = 1; + + private String GUARDIAN_REQUEST_URL = "https://content.guardianapis.com/search?page-size=30"; + + private NewsAdapter mAdapter; + +// private String topic = "debate"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + ListView newsListView = (ListView) findViewById(R.id.list); + + mEmptyStateTextView = (TextView) findViewById(R.id.empty_view); + newsListView.setEmptyView(mEmptyStateTextView); + + mAdapter = new NewsAdapter(this, new ArrayList()); + newsListView.setAdapter(mAdapter); + + newsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView adapterView, View view, int position, long l) { + + News currentNews = mAdapter.getItem(position); + Uri newsUri = Uri.parse(currentNews.getURLaddress()); + + Intent websiteIntent = new Intent(Intent.ACTION_VIEW, newsUri); + startActivity(websiteIntent); + } + }); + + ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo(); + + if (networkInfo != null && networkInfo.isConnected()) { + LoaderManager loaderManager = getLoaderManager(); + loaderManager.initLoader(NEWS_LOADER_ID, null, this); + } else { + mEmptyStateTextView.setText("no internet connection"); + ProgressBar progressBar = (ProgressBar) findViewById(R.id.progress_bar); + progressBar.setVisibility(View.GONE); + } + + NewsAsyncTask task = new NewsAsyncTask(); + task.execute(GUARDIAN_REQUEST_URL); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int id = item.getItemId(); + if (id == R.id.action_settings) { + Intent settingsIntent = new Intent(this, SettingsActivity.class); + startActivity(settingsIntent); + return true; + } + return super.onOptionsItemSelected(item); + } + + @Override + public Loader> onCreateLoader(int i, Bundle bundle) { + + SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); + String topic = sharedPrefs.getString( + "defaultNews", + "debate" + ); + + Uri baseUri = Uri.parse(GUARDIAN_REQUEST_URL); + Uri.Builder uriBuilder = baseUri.buildUpon(); + + uriBuilder.appendQueryParameter("tag", "politics/politics"); + uriBuilder.appendQueryParameter("from-date", "2014-01-01"); + uriBuilder.appendQueryParameter("q", topic); + uriBuilder.appendQueryParameter("api-key", "test"); + + return new NewsLoader(this, uriBuilder.toString()); + + } + + @Override + public void onLoadFinished(Loader> loader, List news) { + mEmptyStateTextView.setText("no articles found"); + mAdapter.clear(); + + ProgressBar progressBar = (ProgressBar) findViewById(R.id.progress_bar); + progressBar.setVisibility(View.GONE); + + if (news != null && !news.isEmpty()) { + mAdapter.addAll(news); + } + } + + @Override + public void onLoaderReset(Loader> loader) { + mAdapter.clear(); + } + + private class NewsAsyncTask extends AsyncTask> { + + @Override + protected List doInBackground(String... urls) { + if (urls.length < 1 || urls[0] == null) { + return null; + } + + List result = DataSink.fetchNewsData(urls[0]); + return result; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/newsapp/News.java b/app/src/main/java/com/example/h_mal/newsapp/News.java new file mode 100644 index 0000000..06cba94 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/newsapp/News.java @@ -0,0 +1,31 @@ +package com.example.h_mal.newsapp; + +/** + * Created by h_mal on 16/03/2017. + */ + +public class News { + + private String mTitle; + + private String mSection; + + private String mURLaddress; + + public News (String title, String section, String URLaddress){ + + mTitle = title; + mSection = section; + mURLaddress = URLaddress; + } + + public String getTitle() { + return mTitle; + } + + public String getSection() { + return mSection; } + + public String getURLaddress() { + return mURLaddress;} +} diff --git a/app/src/main/java/com/example/h_mal/newsapp/NewsAdapter.java b/app/src/main/java/com/example/h_mal/newsapp/NewsAdapter.java new file mode 100644 index 0000000..706f40f --- /dev/null +++ b/app/src/main/java/com/example/h_mal/newsapp/NewsAdapter.java @@ -0,0 +1,45 @@ +package com.example.h_mal.newsapp; + +import android.app.Activity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.TextView; + +import java.util.ArrayList; + +/** + * Created by h_mal on 16/03/2017. + */ + +public class NewsAdapter extends ArrayAdapter{ + + public NewsAdapter(Activity context, ArrayList news) { + + super(context, 0, news); + } + + public View getView(int position, View convertView, ViewGroup parent){ + View listItemView = convertView; + if (listItemView == null) { + listItemView = LayoutInflater.from(getContext()).inflate( + R.layout.list_item, parent, false); + } + + News currentNews = getItem(position); + + String title = currentNews.getTitle(); + String section = currentNews.getSection(); + + TextView titleView = (TextView) listItemView.findViewById(R.id.title); + titleView.setText(title); + + TextView sectionView = (TextView) listItemView.findViewById(R.id.section); + sectionView.setText(section); + + return listItemView; + } + + +} diff --git a/app/src/main/java/com/example/h_mal/newsapp/NewsLoader.java b/app/src/main/java/com/example/h_mal/newsapp/NewsLoader.java new file mode 100644 index 0000000..a35152d --- /dev/null +++ b/app/src/main/java/com/example/h_mal/newsapp/NewsLoader.java @@ -0,0 +1,37 @@ +package com.example.h_mal.newsapp; + +import android.content.AsyncTaskLoader; +import android.content.Context; + +import java.util.List; + +/** + * Created by h_mal on 18/03/2017. + */ + +public class NewsLoader extends AsyncTaskLoader> { + + public static final String LOG_TAG = NewsLoader.class.getName(); + + private String mUrl; + + public NewsLoader(Context context, String url) { + super(context); + mUrl = url; + } + + @Override + protected void onStartLoading() { + forceLoad(); + } + + @Override + public List loadInBackground() { + if (mUrl == null) { + return null; + } + + List result = DataSink.fetchNewsData(mUrl); + return result; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/newsapp/SettingsActivity.java b/app/src/main/java/com/example/h_mal/newsapp/SettingsActivity.java new file mode 100644 index 0000000..f84f0ca --- /dev/null +++ b/app/src/main/java/com/example/h_mal/newsapp/SettingsActivity.java @@ -0,0 +1,56 @@ +package com.example.h_mal.newsapp; + +import android.content.SharedPreferences; +import android.os.Bundle; +import android.preference.ListPreference; +import android.preference.Preference; +import android.preference.PreferenceFragment; +import android.preference.PreferenceManager; +import android.support.v7.app.AppCompatActivity; + +/** + * Created by h_mal on 19/03/2017. + */ + +public class SettingsActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.settings_activity); + } + + public static class NewsPreferenceFragment extends PreferenceFragment implements Preference.OnPreferenceChangeListener { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.settings_main); + + Preference topic = findPreference("defaultNews"); + bindPreferenceSummaryToValue(topic); + } + + private void bindPreferenceSummaryToValue(Preference preference) { + preference.setOnPreferenceChangeListener(this); + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(preference.getContext()); + String preferenceString = preferences.getString(preference.getKey(), ""); + onPreferenceChange(preference, preferenceString); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object value) { + String stringValue = value.toString(); + if (preference instanceof ListPreference) { + ListPreference listPreference = (ListPreference) preference; + int prefIndex = listPreference.findIndexOfValue(stringValue); + if (prefIndex >= 0) { + CharSequence[] labels = listPreference.getEntries(); + preference.setSummary(labels[prefIndex]); + } + } else { + preference.setSummary(stringValue); + } + return true; + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_filter.png b/app/src/main/res/drawable/ic_filter.png new file mode 100644 index 0000000..3306237 Binary files /dev/null and b/app/src/main/res/drawable/ic_filter.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..137a72b --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml new file mode 100644 index 0000000..6f3bc89 --- /dev/null +++ b/app/src/main/res/layout/list_item.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml new file mode 100644 index 0000000..46480df --- /dev/null +++ b/app/src/main/res/layout/settings_activity.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml new file mode 100644 index 0000000..0f53c57 --- /dev/null +++ b/app/src/main/res/menu/main.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml new file mode 100644 index 0000000..21dc9c9 --- /dev/null +++ b/app/src/main/res/values/array.xml @@ -0,0 +1,15 @@ + + + + Debate + Economy + Immigration + Education + + + debate + economy + immigration + education + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..5b35586 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + News app + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/main/res/xml/settings_main.xml b/app/src/main/res/xml/settings_main.xml new file mode 100644 index 0000000..d1e23de --- /dev/null +++ b/app/src/main/res/xml/settings_main.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/example/h_mal/newsapp/ExampleUnitTest.java b/app/src/test/java/com/example/h_mal/newsapp/ExampleUnitTest.java new file mode 100644 index 0000000..29feb13 --- /dev/null +++ b/app/src/test/java/com/example/h_mal/newsapp/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.example.h_mal.newsapp; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..74b2ab0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.2.3' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..aac7c9b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..04e285f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'