Skip to content

Commit

Permalink
Big Big Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
istiakshihab committed Jul 7, 2019
1 parent 8c6072b commit 9d5ffe4
Show file tree
Hide file tree
Showing 49 changed files with 347 additions and 510 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
Binary file modified .idea/caches/gradle_models.ser
Binary file not shown.
1 change: 0 additions & 1 deletion .idea/modules.xml

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

4 changes: 3 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'

android {
compileSdkVersion 26
defaultConfig {
applicationId "com.chameleon.streammusic"
applicationId "com.chameleon.sustcast"
minSdkVersion 16
targetSdkVersion 26
versionCode 1
Expand All @@ -21,6 +22,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.google.firebase:firebase-ads:17.0.0'
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
Expand Down
48 changes: 48 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "903833784828",
"firebase_url": "https://sustcast-18565.firebaseio.com",
"project_id": "sustcast-18565",
"storage_bucket": "sustcast-18565.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:903833784828:android:99477a53d219b25c",
"android_client_info": {
"package_name": "com.chameleon.sustcast"
}
},
"oauth_client": [
{
"client_id": "903833784828-2qg3dmvinjpit91jeb0j17uih917ipdb.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.chameleon.sustcast",
"certificate_hash": "5d2b8fc9396c20db3fdb9f242584394ba95eb83a"
}
},
{
"client_id": "903833784828-kqb3dg09jt609k426m3kdq1pqju9gc0t.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDkcOmpX8OakVhioyCtRqospAyj7eIIshk"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "903833784828-kqb3dg09jt609k426m3kdq1pqju9gc0t.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
27 changes: 15 additions & 12 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,27 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ChatActvity"></activity>
<activity android:name=".ApiLogout" />
<activity android:name=".ApiLogin" />
<activity android:name=".MainScreen">
<meta-data
android:name="com.google.android.gms.ads.AD_MANAGER_APP"
android:value="true"/>

<activity android:name="com.chameleon.sustcast.chatHandler.ChatActvity"></activity>
<activity android:name="com.chameleon.sustcast.authentication.ApiLogout" />
<activity android:name="com.chameleon.sustcast.authentication.ApiLogin" />
<activity android:name="com.chameleon.sustcast.MainScreen">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".Search.RJ" />
<activity android:name=".Favourites.feedback" />
<activity android:name=".Home.Home" />
<activity android:name=".Mood.Facebook" />
<activity android:name=".credit_page" />
<activity android:name=".ApiRegistration" />
<activity android:name=".resetPasswordActivity" />
<activity android:name=".newResetPassword" />
<activity android:name="com.chameleon.sustcast.favorites.feedback" />
<activity android:name="com.chameleon.sustcast.home.Home" />
<activity android:name="com.chameleon.sustcast.mood.Facebook" />
<activity android:name="com.chameleon.sustcast.credit.credit_page" />
<activity android:name="com.chameleon.sustcast.authentication.ApiRegistration" />
<activity android:name="com.chameleon.sustcast.authentication.resetPasswordActivity" />
<activity android:name="com.chameleon.sustcast.authentication.newResetPassword" />
</application>

</manifest>
26 changes: 0 additions & 26 deletions app/src/main/java/com/chameleon/streammusic/Home/LiveFragment.java

This file was deleted.

192 changes: 0 additions & 192 deletions app/src/main/java/com/chameleon/streammusic/Search/RJ.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.chameleon.streammusic;
package com.chameleon.sustcast;

import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
Expand All @@ -8,7 +8,9 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.chameleon.streammusic.Home.Home;
import com.chameleon.streammusic.R;
import com.chameleon.sustcast.fontOverride.FontsOverride;
import com.chameleon.sustcast.home.Home;

public class MainScreen extends AppCompatActivity {
private TextView tvsplash;
Expand All @@ -21,8 +23,8 @@ protected void onCreate(Bundle savedInstanceState) {
FontsOverride.setDefaultFont(this,"MONOSPACE", "doppio_one.ttf");
setContentView(R.layout.activity_main_screen);

tvsplash = (TextView) findViewById(R.id.tvsplash);
iv1 = (ImageView) findViewById(R.id.iv1);
tvsplash = findViewById(R.id.tvsplash);
iv1 = findViewById(R.id.iv1);
Animation myanim = AnimationUtils.loadAnimation(this, R.anim.mytransition);
tvsplash.startAnimation(myanim);
iv1.startAnimation(myanim);
Expand Down
Loading

0 comments on commit 9d5ffe4

Please sign in to comment.