Skip to content

Commit 4c5692e

Browse files
second commit
1 parent 7f840e6 commit 4c5692e

File tree

6 files changed

+31
-50
lines changed

6 files changed

+31
-50
lines changed

.idea/misc.xml

+19-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@ dependencies {
2828
compile 'com.android.support:support-v4:25.2.0'
2929
compile 'com.google.android.gms:play-services:10.2.0'
3030
testCompile 'junit:junit:4.12'
31-
compile project(':magicfragmentlibrary')
31+
compile 'com.github.AleksandarMarinkovic:MagicFragmentLibrary:1.0'
32+
// compile project(':magicfragmentlibrary')
3233
}

app/src/main/java/com/hypercubesoft/mytestapplication/MainActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.widget.Button;
77
import android.widget.LinearLayout;
88

9+
//import com.hypercubesoft.magicfragmentlibrary.FragmentOrganizer;
910
import com.hypercubesoft.magicfragmentlibrary.FragmentOrganizer;
1011
import com.hypercubesoft.mytestapplication.fragments.BlankFragment;
1112
import com.hypercubesoft.mytestapplication.fragments.BlankFragment1;

app/src/main/java/com/hypercubesoft/mytestapplication/fragments/BaseFragment.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
package com.hypercubesoft.mytestapplication.fragments;//package tv.sportssidekick.sportssidekick.fragment;
1+
//package com.hypercubesoft.mytestapplication.fragments;//package tv.sportssidekick.sportssidekick.fragment;
22
//
33
//import android.os.Bundle;
44
//import android.support.annotation.Nullable;
55
//import android.support.v4.app.Fragment;
66
//import android.util.Log;
77
//
88
//import com.google.firebase.auth.FirebaseAuth;
9-
//import com.hwangjr.rxbus.annotation.Subscribe;
109
//
1110
//
1211
//
13-
//import com.hwangjr.rxbus.RxBus;
14-
//import tv.sportssidekick.sportssidekick.service.BusEvent;
15-
//
16-
//
1712
///**
1813
// * Created by Filip on 12/5/2016.
1914
// * Copyright by Hypercube d.o.o.
@@ -54,8 +49,4 @@
5449
// return getArguments().getString(BaseFragment.PRIMARY_ARG_TAG);
5550
// }
5651
//
57-
//
58-
//
59-
//
60-
//
6152
//}

build.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
maven {
7+
name "jitpack"
8+
url "https://jitpack.io"
9+
}
610
}
711
dependencies {
812
classpath 'com.android.tools.build:gradle:2.2.3'
@@ -15,6 +19,10 @@ buildscript {
1519
allprojects {
1620
repositories {
1721
jcenter()
22+
maven {
23+
name "jitpack"
24+
url "https://jitpack.io"
25+
}
1826
}
1927
}
2028

magicfragmentlibrary/src/main/java/com/hypercubesoft/magicfragmentlibrary/BusEvent.java

-22
This file was deleted.

0 commit comments

Comments
 (0)