diff --git a/app/src/main/java/com/macbitsgoa/events/home/HomeActivity.java b/app/src/main/java/com/macbitsgoa/events/home/HomeActivity.java index 637a01d..535860f 100644 --- a/app/src/main/java/com/macbitsgoa/events/home/HomeActivity.java +++ b/app/src/main/java/com/macbitsgoa/events/home/HomeActivity.java @@ -32,8 +32,9 @@ import com.macbitsgoa.events.timeline.TimelineCardFragment; import com.macbitsgoa.events.timer.TimerCardFragment; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; @@ -185,7 +186,7 @@ protected void onCreate(final Bundle savedInstanceState) { } @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, @Nonnull String[] permissions, @Nonnull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); switch (requestCode){ case My_Camera_Request_Code:{ @@ -206,7 +207,7 @@ private void initViews() { } @Override - public boolean onNavigationItemSelected(@NonNull final MenuItem menuItem) { + public boolean onNavigationItemSelected(@Nonnull final MenuItem menuItem) { switch (menuItem.getItemId()) { diff --git a/app/src/main/java/com/macbitsgoa/events/timer/TimerCardFragment.java b/app/src/main/java/com/macbitsgoa/events/timer/TimerCardFragment.java index 27a2d1f..b06ddd3 100644 --- a/app/src/main/java/com/macbitsgoa/events/timer/TimerCardFragment.java +++ b/app/src/main/java/com/macbitsgoa/events/timer/TimerCardFragment.java @@ -2,6 +2,7 @@ import android.os.Bundle; import android.os.CountDownTimer; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,10 +11,17 @@ import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.view.SimpleDraweeView; import com.google.android.material.card.MaterialCardView; +import com.google.firebase.database.DataSnapshot; +import com.google.firebase.database.DatabaseError; +import com.google.firebase.database.DatabaseReference; +import com.google.firebase.database.FirebaseDatabase; +import com.google.firebase.database.ValueEventListener; import com.macbitsgoa.events.BuildConfig; import com.macbitsgoa.events.R; import com.macbitsgoa.events.home.HomeCardInterface; +import org.w3c.dom.Text; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,7 +36,11 @@ public class TimerCardFragment extends Fragment implements HomeCardInterface { - + String endTime = "31.10.2019, 17:30:00"; + TextView tv1, tv2; + SimpleDraweeView q19; + private static final String TAG = TimerCardFragment.class.getSimpleName(); + CountDownTimer backcounter; @Override public View onCreateView(final LayoutInflater inflater, @@ -37,15 +49,44 @@ public View onCreateView(final LayoutInflater inflater, final MaterialCardView selfCard = (MaterialCardView) inflater.inflate(R.layout.fragment_timer_card, container, false); - final TextView tv1= (TextView) selfCard.findViewById(R.id.timer_text_day); - final TextView tv2= (TextView) selfCard.findViewById(R.id.timer_text_time); - final SimpleDraweeView q19= selfCard.findViewById(R.id.item_timer_image); + tv1= (TextView) selfCard.findViewById(R.id.timer_text_day); + tv2= (TextView) selfCard.findViewById(R.id.timer_text_time); + q19= selfCard.findViewById(R.id.item_timer_image); + + + DatabaseReference databaseReference; + databaseReference = FirebaseDatabase.getInstance().getReference().child("timer"); + + databaseReference.addValueEventListener(new ValueEventListener() { + @Override + public void onDataChange(DataSnapshot dataSnapshot) { + endTime = dataSnapshot.child("endTime").getValue().toString(); + reconfigureClock(endTime); + Log.v(TAG,endTime); + } + + @Override + public void onCancelled(DatabaseError databaseError) { + Log.e(TAG, databaseError.getMessage(), databaseError.toException()); + } + }); + Log.v(TAG,endTime+"chage"); + + + + return selfCard; + } + + public void reconfigureClock(String endTime) + { + try + {backcounter.cancel();} + catch(Exception e) + {} SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy, HH:mm:ss"); formatter.setLenient(false); - - String endTime = "31.01.2019, 17:30:00"; long milliseconds=0; Date endDate; try { @@ -61,7 +102,7 @@ public View onCreateView(final LayoutInflater inflater, long diff = milliseconds - startTime; - new CountDownTimer(diff,1) { + backcounter = new CountDownTimer(diff,1) { @Override public void onTick(long millis) { @@ -82,7 +123,5 @@ public void onFinish() { q19.setVisibility(View.VISIBLE); } }.start(); - - return selfCard; } } diff --git a/app/src/main/res/drawable-anydpi/bg2.jpeg b/app/src/main/res/drawable-anydpi/bg2.jpeg new file mode 100644 index 0000000..2c8e0b1 Binary files /dev/null and b/app/src/main/res/drawable-anydpi/bg2.jpeg differ diff --git a/app/src/main/res/drawable/animz.gif b/app/src/main/res/drawable/animz.gif deleted file mode 100644 index 50a1618..0000000 Binary files a/app/src/main/res/drawable/animz.gif and /dev/null differ diff --git a/app/src/main/res/drawable/bg1.jpg b/app/src/main/res/drawable/bg1.jpg index 8b7545e..6d7376e 100644 Binary files a/app/src/main/res/drawable/bg1.jpg and b/app/src/main/res/drawable/bg1.jpg differ diff --git a/app/src/main/res/drawable/bg2.jpeg b/app/src/main/res/drawable/bg2.jpeg deleted file mode 100644 index 62a750f..0000000 Binary files a/app/src/main/res/drawable/bg2.jpeg and /dev/null differ diff --git a/app/src/main/res/drawable/bg3.jpeg b/app/src/main/res/drawable/bg3.jpeg new file mode 100644 index 0000000..d378d34 Binary files /dev/null and b/app/src/main/res/drawable/bg3.jpeg differ diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml index 61908cb..af1520a 100644 --- a/app/src/main/res/drawable/splash.xml +++ b/app/src/main/res/drawable/splash.xml @@ -2,10 +2,16 @@ - - + + + diff --git a/app/src/main/res/drawable/wc.png b/app/src/main/res/drawable/wc.png new file mode 100644 index 0000000..42ce626 Binary files /dev/null and b/app/src/main/res/drawable/wc.png differ diff --git a/app/src/main/res/layout/activity_about_app.xml b/app/src/main/res/layout/activity_about_app.xml index a58f4e9..03e6ce3 100644 --- a/app/src/main/res/layout/activity_about_app.xml +++ b/app/src/main/res/layout/activity_about_app.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> @@ -67,8 +67,9 @@ android:layout_width="match_parent" android:layout_height="160dp" android:layout_gravity="center_horizontal" + android:foregroundGravity="center" android:background="#00000000" - fresco:actualImageResource="@drawable/quarks" + fresco:actualImageResource="@drawable/wc" fresco:actualImageScaleType="fitCenter" tools:background="#00000000" /> diff --git a/app/src/main/res/layout/activity_about_mac.xml b/app/src/main/res/layout/activity_about_mac.xml index 1f4f937..7f5d92b 100644 --- a/app/src/main/res/layout/activity_about_mac.xml +++ b/app/src/main/res/layout/activity_about_mac.xml @@ -18,7 +18,7 @@ android:id="@+id/mac_toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#00000000" + android:background="#FF230E00" android:elevation="0dp" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> diff --git a/app/src/main/res/layout/activity_eateries.xml b/app/src/main/res/layout/activity_eateries.xml index 4fd0dc1..788d906 100644 --- a/app/src/main/res/layout/activity_eateries.xml +++ b/app/src/main/res/layout/activity_eateries.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/eateries_appbar" - android:background="#00000000" + android:background="#FF230E00" android:elevation="0dp" android:theme="@style/AppTheme.AppBarOverlay"> @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> diff --git a/app/src/main/res/layout/activity_festmerch.xml b/app/src/main/res/layout/activity_festmerch.xml index ca6f9ac..100e40c 100644 --- a/app/src/main/res/layout/activity_festmerch.xml +++ b/app/src/main/res/layout/activity_festmerch.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 7870270..87a3f6c 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -20,6 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" + android:background="@drawable/bg2" xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".home.HomeActivity"> @@ -36,7 +37,7 @@ android:layout_height="@dimen/action_bar_height" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:popupTheme="@style/AppTheme.PopupOverlay"> @@ -49,14 +50,24 @@ - - + />--> + + diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index adf2bb8..3e77d03 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> diff --git a/app/src/main/res/layout/activity_social.xml b/app/src/main/res/layout/activity_social.xml index 0a63e17..15e95d0 100644 --- a/app/src/main/res/layout/activity_social.xml +++ b/app/src/main/res/layout/activity_social.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> diff --git a/app/src/main/res/layout/activity_speakers.xml b/app/src/main/res/layout/activity_speakers.xml index eccfbe7..df2a52c 100644 --- a/app/src/main/res/layout/activity_speakers.xml +++ b/app/src/main/res/layout/activity_speakers.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> diff --git a/app/src/main/res/layout/activity_sponsor.xml b/app/src/main/res/layout/activity_sponsor.xml index 80ae03f..e7b252e 100644 --- a/app/src/main/res/layout/activity_sponsor.xml +++ b/app/src/main/res/layout/activity_sponsor.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> diff --git a/app/src/main/res/layout/activity_timeline.xml b/app/src/main/res/layout/activity_timeline.xml index 593bdc5..ed3443b 100644 --- a/app/src/main/res/layout/activity_timeline.xml +++ b/app/src/main/res/layout/activity_timeline.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" - android:background="#00000000" + android:background="#FF230E00" app:layout_scrollFlags="enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> diff --git a/app/src/main/res/layout/fragment_timer_card.xml b/app/src/main/res/layout/fragment_timer_card.xml index 0d77eac..77fcac9 100644 --- a/app/src/main/res/layout/fragment_timer_card.xml +++ b/app/src/main/res/layout/fragment_timer_card.xml @@ -20,7 +20,7 @@ @@ -43,9 +43,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/timer_text_time" - android:text="@string/timer" + android:text="@string/timersubtext" android:textAlignment="gravity" - android:textColor="#cecece" + android:textColor="#FF301300" android:textSize="50sp" android:background="#00000000" android:fontFamily="@font/bgothm" @@ -53,12 +53,13 @@ diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 694a586..f76a113 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -1,15 +1,27 @@ - + android:layout_height="match_parent"> + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_home_drawer.xml b/app/src/main/res/menu/activity_home_drawer.xml index fafb29f..bfa3867 100644 --- a/app/src/main/res/menu/activity_home_drawer.xml +++ b/app/src/main/res/menu/activity_home_drawer.xml @@ -45,7 +45,7 @@ - #3F51B5 - #303F9F + #FF160100 + #160100 #00b6e5 #0063ab #FF4081 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0750a12..a7f8ff9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - Quark\'19 + Waves\'19 1007225187624-ve88c33iuivn0u1ulp8d3ajm8sbh95ai.apps.googleusercontent.com T-VyF_aN8UEFx359muCmujqG https://events-f6847.firebaseapp.com/__/auth/handler @@ -13,10 +13,11 @@ Invalid URL - About Quark\'19 + About Waves\'19 About MAC Timeline - Timer Test + Coming soon + Stay tuned Exhibition Social EateriesActivity