diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..e95f22e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..3b31283 --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/animated_vector_drawable_23_3_0.xml b/.idea/libraries/animated_vector_drawable_23_3_0.xml index 4ba521e..c887d48 100644 --- a/.idea/libraries/animated_vector_drawable_23_3_0.xml +++ b/.idea/libraries/animated_vector_drawable_23_3_0.xml @@ -1,13 +1,13 @@ - + - + diff --git a/.idea/libraries/appcompat_v7_23_3_0.xml b/.idea/libraries/appcompat_v7_23_3_0.xml index de5aaeb..39b4f84 100644 --- a/.idea/libraries/appcompat_v7_23_3_0.xml +++ b/.idea/libraries/appcompat_v7_23_3_0.xml @@ -4,13 +4,13 @@ - + - + diff --git a/.idea/libraries/design_23_3_0.xml b/.idea/libraries/design_23_3_0.xml index 1120123..6172f7d 100644 --- a/.idea/libraries/design_23_3_0.xml +++ b/.idea/libraries/design_23_3_0.xml @@ -4,13 +4,13 @@ - + - + diff --git a/.idea/libraries/recyclerview_v7_23_3_0.xml b/.idea/libraries/recyclerview_v7_23_3_0.xml index 36865de..7b42040 100644 --- a/.idea/libraries/recyclerview_v7_23_3_0.xml +++ b/.idea/libraries/recyclerview_v7_23_3_0.xml @@ -9,8 +9,8 @@ - + diff --git a/.idea/libraries/support_annotations_23_3_0.xml b/.idea/libraries/support_annotations_23_3_0.xml index 118a0e7..f9004af 100644 --- a/.idea/libraries/support_annotations_23_3_0.xml +++ b/.idea/libraries/support_annotations_23_3_0.xml @@ -1,12 +1,12 @@ - + - + diff --git a/.idea/libraries/support_v4_23_3_0.xml b/.idea/libraries/support_v4_23_3_0.xml index 62a2f14..68eb591 100644 --- a/.idea/libraries/support_v4_23_3_0.xml +++ b/.idea/libraries/support_v4_23_3_0.xml @@ -10,8 +10,8 @@ - + diff --git a/.idea/libraries/support_vector_drawable_23_3_0.xml b/.idea/libraries/support_vector_drawable_23_3_0.xml index b4ad228..55e107d 100644 --- a/.idea/libraries/support_vector_drawable_23_3_0.xml +++ b/.idea/libraries/support_vector_drawable_23_3_0.xml @@ -6,8 +6,8 @@ - + diff --git a/.idea/libraries/volley_1_0_0.xml b/.idea/libraries/volley_1_0_0.xml index 81a83dd..8e317b7 100644 --- a/.idea/libraries/volley_1_0_0.xml +++ b/.idea/libraries/volley_1_0_0.xml @@ -1,8 +1,8 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c591ffe..914731c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,21 +21,15 @@ android:theme="@style/AppTheme"> + android:theme="@style/Theme.Design.NoActionBar"> + - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java index 0caf2a6..8bf155a 100644 --- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java +++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java @@ -199,7 +199,7 @@ public class GPSUtils extends Service implements LocationListener { return addresses; } else { - Toast.makeText(this, "latitude and longitude are null", + Toast.makeText(mContext, "latitude and longitude are null", Toast.LENGTH_LONG).show(); return null; } diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SplashActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SplashActivity.java index 5d4ac8a..3b134df 100644 --- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SplashActivity.java +++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SplashActivity.java @@ -3,24 +3,40 @@ package com.android_app.matan.ara.sagi.thesocialnotework; import android.content.Intent; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.util.Log; +import android.view.Window; import android.widget.ImageView; public class SplashActivity extends AppCompatActivity { private ImageView appSplashScreen; + private int timerDelay = 3000; + private final String TAG = "Splash Screen Activity"; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splash); - appSplashScreen = (ImageView) findViewById(R.id.sa_splashScreenImage); - Intent intent = new Intent(this, LoginActivity.class); - startActivity(intent); - finish(); + Thread timerThread = new Thread(){ + public void run(){ + try{ + sleep(timerDelay); + }catch(InterruptedException e){ + e.printStackTrace(); + }finally{ + startActivity(new Intent(SplashActivity.this, LoginActivity.class)); + finish(); + } + } + }; + timerThread.start(); } -// protected void onCreate(Bundle savedInstanceState) { -// super.onCreate(savedInstanceState); -// setContentView(R.layout.activity_splash); -// } + @Override + protected void onPause() { + // TODO Auto-generated method stub + super.onPause(); + finish(); + } } diff --git a/app/src/main/res/drawable/splash_screen.JPG b/app/src/main/res/drawable/splash_screen.JPG new file mode 100644 index 0000000..fb959b8 Binary files /dev/null and b/app/src/main/res/drawable/splash_screen.JPG differ diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 7036fbc..792f6c9 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -1,18 +1,9 @@ - - - - + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@drawable/splash_screen" + tools:context="com.android_app.matan.ara.sagi.thesocialnotework.SplashActivity" + android:visibility="visible"> + diff --git a/app/src/main/res/layout/note_view_full.xml b/app/src/main/res/layout/note_view_full.xml index de1b3a7..50d052b 100644 --- a/app/src/main/res/layout/note_view_full.xml +++ b/app/src/main/res/layout/note_view_full.xml @@ -8,11 +8,20 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> + + + + @@ -21,44 +30,42 @@ android:id="@+id/nvf_note_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|top" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:layout_marginTop="65dp" android:autoText="false" android:editable="true" android:elegantTextHeight="false" android:maxLines="1" - android:text="Title" + android:text="@string/nvf_title" android:textColor="#c5c4c4" /> + android:text="@string/nvf_content" + android:textColor="#c5c4c4" + android:layout_marginTop="20dp" /> -