Skip to content

Commit

Permalink
Merge branch 'release/0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
d3m1d0v committed Apr 3, 2018
2 parents 664622b + 775085b commit 2321021
Show file tree
Hide file tree
Showing 50 changed files with 2,846 additions and 607 deletions.
6 changes: 6 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 31 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
compileSdkVersion 27
defaultConfig {
applicationId "com.example.vladislav.menu"
minSdkVersion 19
targetSdkVersion 26
targetSdkVersion 27
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -18,10 +18,35 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:appcompat-v7:27.1.0'
implementation 'com.android.support:design:27.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:0.5'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'

implementation "android.arch.persistence.room:runtime:1.0.0"
annotationProcessor "android.arch.persistence.room:compiler:1.0.0"

compile 'com.google.firebase:firebase-core:11.8.0'
compile 'com.google.firebase:firebase-messaging:11.8.0'

implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
// Because RxAndroid releases are few and far between, it is recommended you also
// explicitly depend on RxJava's latest version for bug fixes and new features.
// (see https://github.com/ReactiveX/RxJava/releases for latest 2.x.x version)
implementation 'io.reactivex.rxjava2:rxjava:2.x.x'
// retrofit rxjava2 plugin
compile 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
// https://mvnrepository.com/artifact/android.arch.persistence.room/rxjava2
compile group: 'android.arch.persistence.room', name: 'rxjava2', version: '1.0.0'

//implementation 'com.jakewharton:butterknife:8.8.1'
//annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
}

apply plugin: 'com.google.gms.google-services'
30 changes: 27 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.vladislav.menu"
android:versionCode="1"
android:versionName="0.1.0-alpha">
android:versionCode="2"
android:versionName="0.5.0-beta">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:name="com.example.vladislav.app.App"
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=".MenuActivity"
android:name="com.example.vladislav.screen.menu.MenuActivity"
android:label="@string/app_name"
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="com.example.vladislav.screen.detailscreen.DetailScreenActivity"
android:label="@string/title_activity_detail_screen" />
<activity android:name="com.example.vladislav.screen.notificationscreen.ICONotificationActivity"/>

<service
android:name="com.example.vladislav.service.TestFirebaseMessagingService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>

<service
android:name="com.example.vladislav.service.TestFirebaseInstanceIdService">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>

</application>

</manifest>
23 changes: 23 additions & 0 deletions app/src/main/java/com/example/vladislav/app/App.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.example.vladislav.app;

import android.app.Application;
import android.content.Context;

/**
* Created by d3m1d0v on 22.03.2018.
*/

public class App extends Application {

private static App INSTANCE;

public App() {
super();

INSTANCE = this;
}

public static Context getAppContext() {
return INSTANCE.getApplicationContext();
}
}
33 changes: 33 additions & 0 deletions app/src/main/java/com/example/vladislav/app/Constant.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.example.vladislav.app;

/**
* Created by Isa on 09.03.2018.
*/

public class Constant {
//https://developer.android.com/reference/android/util/Log.html
public static final String TAG = "Crypto";

public static final String[] CURRENCIES_NAME = {
"BTC",
"ETH",
"LTC",
"XRP",
"BCH",
"TRX",
"ETC",
"EOS",
"NEO",
"XMR",
"DASH",
"XRB",
"HT",
"OMG",
"ZEC",
"ADA",
"BNB",
"ABT*",
"IOT",
"IOST",
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.example.vladislav;
package com.example.vladislav.base;

public interface BasePresenter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.example.vladislav;
package com.example.vladislav.base;

public interface BaseView<T> {

Expand Down
28 changes: 28 additions & 0 deletions app/src/main/java/com/example/vladislav/data/CryptoDatabase.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.example.vladislav.data;

import android.arch.persistence.room.Database;
import android.arch.persistence.room.Room;
import android.arch.persistence.room.RoomDatabase;

import com.example.vladislav.app.App;

/**
* Created by d3m1d0v on 22.03.2018.
*/

@Database(entities = {CurrencyData.class}, version = 3)
public abstract class CryptoDatabase extends RoomDatabase {

private static CryptoDatabase INSTANCE;

public abstract CurrencyDataDao currencyDataDao();

public static CryptoDatabase getInstance() {
if (INSTANCE == null) {
INSTANCE = Room.databaseBuilder(App.getAppContext(),
CryptoDatabase.class, "Crypto.db")
.fallbackToDestructiveMigration().build();
}
return INSTANCE;
}
}
14 changes: 0 additions & 14 deletions app/src/main/java/com/example/vladislav/data/CryptoRepository.java

This file was deleted.

51 changes: 0 additions & 51 deletions app/src/main/java/com/example/vladislav/data/CurrencyBaseInfo.java

This file was deleted.

Loading

0 comments on commit 2321021

Please sign in to comment.