Skip to content

Commit

Permalink
gradle update
Browse files Browse the repository at this point in the history
  • Loading branch information
tiroman committed Nov 1, 2017
1 parent d051ce7 commit 8567784
Show file tree
Hide file tree
Showing 53 changed files with 434 additions and 279 deletions.
28 changes: 16 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION

compileSdkVersion 26
defaultConfig {
applicationId "com.unnamed.b.atv.demo"
minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
versionName project.VERSION_NAME
versionCode Integer.parseInt(project.VERSION_CODE)
applicationId "com.unnamed.b.atv.example"
minSdkVersion 15
targetSdkVersion 26
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'])
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.github.johnkil.print:print:1.2.2'
compile project(':library')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
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'
implementation 'com.github.johnkil.print:print:1.3.1'
implementation project(':library')
}
16 changes: 10 additions & 6 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/bogdan/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
# You can control the set of applied configuration files using the
# proguardFiles setting 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 *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.unnamed.b.atv.example;

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.*;

/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.unnamed.b.atv.example", appContext.getPackageName());
}
}
12 changes: 6 additions & 6 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.unnamed.b.atv.sample">
package="com.unnamed.b.atv.example">

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
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=".activity.MainActivity"
android:label="@string/app_name">
<activity android:name=".activity.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -19,4 +19,4 @@
<activity android:name=".activity.SingleFragmentActivity" />
</application>

</manifest>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
package com.unnamed.b.atv.sample.activity;
package com.unnamed.b.atv.example.activity;

import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;

import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.sample.fragment.CustomViewHolderFragment;
import com.unnamed.b.atv.sample.fragment.FolderStructureFragment;
import com.unnamed.b.atv.sample.fragment.SelectableTreeFragment;
import com.unnamed.b.atv.sample.fragment.TwoDScrollingArrowExpandFragment;
import com.unnamed.b.atv.sample.fragment.TwoDScrollingFragment;
import com.unnamed.b.atv.example.R;
import com.unnamed.b.atv.example.fragment.CustomViewHolderFragment;
import com.unnamed.b.atv.example.fragment.FolderStructureFragment;
import com.unnamed.b.atv.example.fragment.SelectableTreeFragment;
import com.unnamed.b.atv.example.fragment.TwoDScrollingArrowExpandFragment;
import com.unnamed.b.atv.example.fragment.TwoDScrollingFragment;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;


public class MainActivity extends ActionBarActivity {
public class MainActivity extends AppCompatActivity {


@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.unnamed.b.atv.sample.activity;
package com.unnamed.b.atv.example.activity;

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

import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.example.R;

/**
* Created by Bogdan Melnychuk on 2/12/15.
*/
public class SingleFragmentActivity extends ActionBarActivity {
public class SingleFragmentActivity extends AppCompatActivity {
public final static String FRAGMENT_PARAM = "fragment";

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.fragment;
package com.unnamed.b.atv.example.fragment;

import android.app.Fragment;
import android.os.Bundle;
Expand All @@ -7,13 +7,13 @@
import android.view.View;
import android.view.ViewGroup;

import com.unnamed.b.atv.example.R;
import com.unnamed.b.atv.example.holder.HeaderHolder;
import com.unnamed.b.atv.example.holder.IconTreeItemHolder;
import com.unnamed.b.atv.example.holder.PlaceHolderHolder;
import com.unnamed.b.atv.example.holder.ProfileHolder;
import com.unnamed.b.atv.example.holder.SocialViewHolder;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.sample.holder.HeaderHolder;
import com.unnamed.b.atv.sample.holder.IconTreeItemHolder;
import com.unnamed.b.atv.sample.holder.PlaceHolderHolder;
import com.unnamed.b.atv.sample.holder.ProfileHolder;
import com.unnamed.b.atv.sample.holder.SocialViewHolder;
import com.unnamed.b.atv.view.AndroidTreeView;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.fragment;
package com.unnamed.b.atv.example.fragment;

import android.app.Fragment;
import android.os.Bundle;
Expand All @@ -12,9 +12,9 @@
import android.widget.TextView;
import android.widget.Toast;

import com.unnamed.b.atv.example.R;
import com.unnamed.b.atv.example.holder.IconTreeItemHolder;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.sample.holder.IconTreeItemHolder;
import com.unnamed.b.atv.view.AndroidTreeView;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.fragment;
package com.unnamed.b.atv.example.fragment;

import android.app.Fragment;
import android.os.Bundle;
Expand All @@ -8,12 +8,12 @@
import android.view.ViewGroup;
import android.widget.Toast;

import com.unnamed.b.atv.example.R;
import com.unnamed.b.atv.example.holder.IconTreeItemHolder;
import com.unnamed.b.atv.example.holder.ProfileHolder;
import com.unnamed.b.atv.example.holder.SelectableHeaderHolder;
import com.unnamed.b.atv.example.holder.SelectableItemHolder;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.sample.holder.IconTreeItemHolder;
import com.unnamed.b.atv.sample.holder.ProfileHolder;
import com.unnamed.b.atv.sample.holder.SelectableHeaderHolder;
import com.unnamed.b.atv.sample.holder.SelectableItemHolder;
import com.unnamed.b.atv.view.AndroidTreeView;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.fragment;
package com.unnamed.b.atv.example.fragment;

import android.app.Fragment;
import android.os.Bundle;
Expand All @@ -8,10 +8,10 @@
import android.view.ViewGroup;
import android.widget.Toast;

import com.unnamed.b.atv.example.R;
import com.unnamed.b.atv.example.holder.ArrowExpandSelectableHeaderHolder;
import com.unnamed.b.atv.example.holder.IconTreeItemHolder;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.sample.holder.ArrowExpandSelectableHeaderHolder;
import com.unnamed.b.atv.sample.holder.IconTreeItemHolder;
import com.unnamed.b.atv.view.AndroidTreeView;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.fragment;
package com.unnamed.b.atv.example.fragment;

import android.app.Fragment;
import android.os.Bundle;
Expand All @@ -7,10 +7,10 @@
import android.view.View;
import android.view.ViewGroup;

import com.unnamed.b.atv.example.R;
import com.unnamed.b.atv.example.holder.IconTreeItemHolder;
import com.unnamed.b.atv.example.holder.SelectableHeaderHolder;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.sample.holder.IconTreeItemHolder;
import com.unnamed.b.atv.sample.holder.SelectableHeaderHolder;
import com.unnamed.b.atv.view.AndroidTreeView;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.holder;
package com.unnamed.b.atv.example.holder;

import android.content.Context;
import android.view.LayoutInflater;
Expand All @@ -8,8 +8,8 @@
import android.widget.TextView;

import com.github.johnkil.print.PrintView;
import com.unnamed.b.atv.example.R;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;

/**
* Created by Bogdan Melnychuk on 2/15/15, modified by Szigeti Peter 2/2/16.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.unnamed.b.atv.sample.holder;
package com.unnamed.b.atv.example.holder;

import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;

import com.github.johnkil.print.PrintView;
import com.unnamed.b.atv.example.R;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;

/**
* Created by Bogdan Melnychuk on 2/13/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.holder;
package com.unnamed.b.atv.example.holder;

import android.content.Context;
import android.view.LayoutInflater;
Expand All @@ -7,7 +7,7 @@

import com.github.johnkil.print.PrintView;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.example.R;

/**
* Created by Bogdan Melnychuk on 2/12/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.holder;
package com.unnamed.b.atv.example.holder;

import android.content.Context;
import android.view.LayoutInflater;
Expand All @@ -7,7 +7,7 @@

import com.github.johnkil.print.PrintView;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.example.R;

import java.util.Random;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.holder;
package com.unnamed.b.atv.example.holder;

import android.content.Context;
import android.view.LayoutInflater;
Expand All @@ -7,7 +7,7 @@

import com.github.johnkil.print.PrintView;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.example.R;

/**
* Created by Bogdan Melnychuk on 2/13/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.holder;
package com.unnamed.b.atv.example.holder;

import android.content.Context;
import android.view.LayoutInflater;
Expand All @@ -9,7 +9,7 @@

import com.github.johnkil.print.PrintView;
import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.example.R;

/**
* Created by Bogdan Melnychuk on 2/15/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.unnamed.b.atv.sample.holder;
package com.unnamed.b.atv.example.holder;

import android.content.Context;
import android.view.LayoutInflater;
Expand All @@ -8,7 +8,7 @@
import android.widget.TextView;

import com.unnamed.b.atv.model.TreeNode;
import com.unnamed.b.atv.sample.R;
import com.unnamed.b.atv.example.R;

/**
* Created by Bogdan Melnychuk on 2/15/15.
Expand Down
Loading

0 comments on commit 8567784

Please sign in to comment.