Skip to content

Commit

Permalink
Finished V-1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
RamolaWeb committed Mar 13, 2017
1 parent 365efec commit eedd585
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 46 deletions.
5 changes: 0 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ dependencies {
compile 'com.github.jd-alexander:LikeButton:0.2.0'
compile 'com.cloudinary:cloudinary-android:1.2.2'
compile 'com.android.support:palette-v7:25.0.1'

compile 'net.steamcrafted:load-toast:1.0.10'
compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
compile 'com.github.florent37:materialleanback:1.0.2'
compile 'com.nineoldandroids:library:2.4.0'
}
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<activity
android:name=".Activity.AboutActivity"
android:label="@string/title_activity_about"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.nith.appteam.nimbus.Activity.MainActivity" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class AboutActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
setContentView(R.layout.content_about);
initCollapsingToolbar();
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
Expand Down
34 changes: 0 additions & 34 deletions app/src/main/res/layout/activity_about.xml

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_fblogin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
android:layout_height="320dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="54dp"
android:src="@drawable/nimbuslogo" />
android:src="@drawable/logo_b_t" />

<ProgressBar
android:id="@+id/pbLogin"
Expand Down Expand Up @@ -46,6 +46,6 @@
android:textSize="16dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="100dp" />
android:layout_marginBottom="200dp" />

</RelativeLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Nimbus 2k17</string>
<string name="app_name">Udgham</string>
<string name="title_activity_appintro">appintro</string>
<string name="next">Next</string>
<string name="skip">Skip</string>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.2.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 comments on commit eedd585

Please sign in to comment.