Revert "Merge branch 'master' of https://github.com/appledora/TheMeow"

This reverts commit 2a564c5
sustcast · Jul 7, 2019 · 8c6072b · 8c6072b
1 parent 38332d2
commit 8c6072b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     defaultConfig {
         applicationId "com.chameleon.streammusic"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,25 +20,25 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
     //Design Library for Co-ordinator
 
     //BottomNavigationViewEx Library
 
-    implementation 'com.android.support:appcompat-v7:25.3.1'
-    implementation 'com.android.support:cardview-v7:25.3.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:design:25.3.1'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:cardview-v7:26.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:design:26.1.0'
     implementation 'com.github.ittianyu:BottomNavigationViewEx:1.1.9'
     implementation 'de.hdodenhof:circleimageview:3.0.0'
 
-    implementation 'com.squareup.retrofit2:retrofit:2.2.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.2.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.4.1'
+    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.0.0'
     implementation 'me.himanshusoni.chatmessageview:chat-message-view:1.0.3'
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/com/chameleon/streammusic/Home/Home.java b/app/src/main/java/com/chameleon/streammusic/Home/Home.java
@@ -84,20 +84,20 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
 
-        mLogout = (Button)findViewById(R.id.buttonLogout);
-        mChat = (Button) findViewById(R.id.buttonChat);
+        mLogout = findViewById(R.id.buttonLogout);
+        mChat = findViewById(R.id.buttonChat);
         mAPIService = ApiUtils.getAPIService();
         token2 = getIntent().getStringExtra("token");
         buttonFlag = 0;
         setupBottomNavigationView();
         setupViewPager();
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
 
-        drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
-        NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+        drawer = findViewById(R.id.drawer_layout);
+        NavigationView navigationView = findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_close, R.string.navigation_drawer_open);
         drawer.addDrawerListener(toggle);
@@ -117,7 +117,7 @@ public void onClick(View view) {
         });
         FontsOverride.setDefaultFont(this, "MONOSPACE", "doppio_one.ttf");
         setupBottomNavigationView();
-        drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        drawer = findViewById(R.id.drawer_layout);
 
 
        /* final Button button = (Button) findViewById(R.id.floatplay);
@@ -153,10 +153,10 @@ private void setupViewPager() {
         adapter.addFragment(new HomeFragment());
         adapter.addFragment(new TrendingFragment());
 
-        ViewPager viewPager = (ViewPager) findViewById(R.id.container);
+        ViewPager viewPager = findViewById(R.id.container);
         viewPager.setAdapter(adapter);
 
-        TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
+        TabLayout tabLayout = findViewById(R.id.tabs);
         tabLayout.setupWithViewPager(viewPager);
 
         tabLayout.getTabAt(0).setText("Live");
@@ -207,7 +207,7 @@ public void onBackPressed() {
 
     private void setupBottomNavigationView() {
         Log.d(TAG, "setupBottomNavigationView: setting up BottomNavigationView");
-        BottomNavigationViewEx bottomNavigationViewEx = (BottomNavigationViewEx) findViewById(R.id.bottomNavViewBar);
+        BottomNavigationViewEx bottomNavigationViewEx = findViewById(R.id.bottomNavViewBar);
         BottomNavigationViewHelper.setupBottomNavigationView(bottomNavigationViewEx);
         BottomNavigationViewHelper.enableNavigation(mContext, bottomNavigationViewEx);