Skip to content

Commit eedd585

Browse files
committed
Finished V-1.1
1 parent 365efec commit eedd585

File tree

8 files changed

+7
-46
lines changed

8 files changed

+7
-46
lines changed

app/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,4 @@ dependencies {
4242
compile 'com.github.jd-alexander:LikeButton:0.2.0'
4343
compile 'com.cloudinary:cloudinary-android:1.2.2'
4444
compile 'com.android.support:palette-v7:25.0.1'
45-
46-
compile 'net.steamcrafted:load-toast:1.0.10'
47-
compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
48-
compile 'com.github.florent37:materialleanback:1.0.2'
49-
compile 'com.nineoldandroids:library:2.4.0'
5045
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<activity
141141
android:name=".Activity.AboutActivity"
142142
android:label="@string/title_activity_about"
143-
android:theme="@style/AppTheme">
143+
android:theme="@style/AppTheme.NoActionBar">
144144
<meta-data
145145
android:name="android.support.PARENT_ACTIVITY"
146146
android:value="com.nith.appteam.nimbus.Activity.MainActivity" />

app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class AboutActivity extends AppCompatActivity {
2222
@Override
2323
protected void onCreate(Bundle savedInstanceState) {
2424
super.onCreate(savedInstanceState);
25-
setContentView(R.layout.activity_about);
25+
setContentView(R.layout.content_about);
2626
initCollapsingToolbar();
2727
toolbar = (Toolbar) findViewById(R.id.toolbar);
2828
setSupportActionBar(toolbar);

app/src/main/res/layout/activity_about.xml

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/src/main/res/layout/fragment_fblogin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:layout_height="320dp"
1010
android:layout_centerHorizontal="true"
1111
android:layout_marginTop="54dp"
12-
android:src="@drawable/nimbuslogo" />
12+
android:src="@drawable/logo_b_t" />
1313

1414
<ProgressBar
1515
android:id="@+id/pbLogin"
@@ -46,6 +46,6 @@
4646
android:textSize="16dp"
4747
android:layout_alignParentBottom="true"
4848
android:layout_centerHorizontal="true"
49-
android:layout_marginBottom="100dp" />
49+
android:layout_marginBottom="200dp" />
5050

5151
</RelativeLayout>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<resources>
2-
<string name="app_name">Nimbus 2k17</string>
2+
<string name="app_name">Udgham</string>
33
<string name="title_activity_appintro">appintro</string>
44
<string name="next">Next</string>
55
<string name="skip">Skip</string>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:2.3.0'
14+
classpath 'com.android.tools.build:gradle:2.2.3'
1515

1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)