Преглед изворни кода

UI improvements.
Synt interval increased.

seavenois пре 10 година
родитељ
комит
10dd19a043

+ 2 - 2
app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.ivalentin.margolariak"
-    android:versionCode="17"
-    android:versionName="2.0.3" >
+    android:versionCode="18"
+    android:versionName="2.0.4" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

+ 4 - 4
app/src/main/java/com/ivalentin/margolariak/BlogLayout.java

@@ -78,7 +78,7 @@ public class BlogLayout extends Fragment{
                btnNext.setVisibility(View.VISIBLE);
                populate(offset);
                if (offset == 0){
-                   v.setVisibility(View.GONE);
+                   v.setVisibility(View.INVISIBLE);
                }
            }
         });
@@ -90,7 +90,7 @@ public class BlogLayout extends Fragment{
                btnPrevious.setVisibility(View.VISIBLE);
                populate(offset);
                if (offset >= totalPost - 5){
-                   v.setVisibility(View.GONE);
+                   v.setVisibility(View.INVISIBLE);
                }
            }
         });
@@ -114,13 +114,13 @@ public class BlogLayout extends Fragment{
         Button btnPrevious = (Button) view.findViewById(R.id.bt_blog_previous);
         Button btnNext = (Button) view.findViewById(R.id.bt_blog_next);
         if (offset == 0){
-            btnPrevious.setVisibility(View.GONE);
+            btnPrevious.setVisibility(View.INVISIBLE);
         }
         else{
             btnPrevious.setVisibility(View.VISIBLE);
         }
         if (offset >= totalPost - 5){
-            btnNext.setVisibility(View.GONE);
+            btnNext.setVisibility(View.INVISIBLE);
         }
         else{
             btnNext.setVisibility(View.VISIBLE);

+ 1 - 1
app/src/main/java/com/ivalentin/margolariak/GM.java

@@ -39,7 +39,7 @@ final class GM {
 	/**
 	 * Period of time (in seconds) at the end of witch the app will perform a sync.
 	 */
-	static final int PERIOD_SYNC = 10 * 60 * 1000;
+	static final int PERIOD_SYNC = 20 * 60 * 1000;
 	
 	/**
 	 * Name of the preference to store the user code with.

+ 9 - 2
app/src/main/java/com/ivalentin/margolariak/MainActivity.java

@@ -24,7 +24,10 @@ import android.view.View.OnClickListener;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 /**
@@ -182,6 +185,8 @@ public class MainActivity extends Activity{
 	    //Set layout.
 		setContentView(R.layout.activity_main);
 		mLayout = (MainLayout) findViewById(R.id.main_layout);
+
+
 		
 		//Assign menu button
 		ImageButton btMenu = (ImageButton) findViewById(R.id.bt_menu); 
@@ -523,7 +528,8 @@ public class MainActivity extends Activity{
 	 */
 	private void sync(){
 		ProgressBar pbSync = (ProgressBar) findViewById(R.id.pb_sync);
-		new Sync(this, pbSync).execute();
+		ImageView ivSync = (ImageView) findViewById(R.id.iv_logo);
+		new Sync(this, pbSync, ivSync).execute();
 	}
 	
 	/**
@@ -551,7 +557,8 @@ public class MainActivity extends Activity{
 		
 		//Sync
 		ProgressBar pbSync = (ProgressBar) findViewById(R.id.pb_sync);
-		new Sync(this, pbSync, dialog, this).execute();
+		ImageView ivSync = (ImageView) findViewById(R.id.iv_logo);
+		new Sync(this, pbSync, ivSync, dialog, this).execute();
 	}
 	
 	/**

+ 14 - 6
app/src/main/java/com/ivalentin/margolariak/Sync.java

@@ -14,6 +14,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.Window;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -28,6 +29,7 @@ class Sync extends AsyncTask<Void, Void, Void> {
 	
 	private final Context myContextRef;
 	private ProgressBar pbSync;
+	private ImageView ivSync;
 	private Dialog dialog;
 	private MainActivity activity;
 	private int fg;
@@ -44,8 +46,10 @@ class Sync extends AsyncTask<Void, Void, Void> {
 	 */
 	@Override
 	protected void onPreExecute(){
-		if (pbSync != null)
+		if (pbSync != null) {
 			pbSync.setVisibility(View.VISIBLE);
+			ivSync.setVisibility(View.GONE);
+		}
 		if (dialog != null) {
 			dialog.show();
 			strings = new String[10];
@@ -73,8 +77,10 @@ class Sync extends AsyncTask<Void, Void, Void> {
 	 */
 	@Override
 	protected void onPostExecute(Void v){
-		if (pbSync != null)
-			pbSync.setVisibility(View.INVISIBLE);
+		if (pbSync != null) {
+			pbSync.setVisibility(View.GONE);
+			ivSync.setVisibility(View.VISIBLE);
+		}
 		if (dialog != null){
 			dialog.dismiss();
 			//Check db version agan
@@ -123,10 +129,11 @@ class Sync extends AsyncTask<Void, Void, Void> {
      * @param myContextRef The Context of the calling activity.
      * @param pb The progress bar that will be shown while the sync goes on.
      */
-    public Sync(Activity myContextRef, ProgressBar pb) {
+    public Sync(Activity myContextRef, ProgressBar pb, ImageView iv) {
         this.myContextRef = myContextRef;
         dialog = null;
         pbSync = pb;
+		ivSync = iv;
         fg = 1;
     }
     
@@ -140,11 +147,12 @@ class Sync extends AsyncTask<Void, Void, Void> {
      * @param pb The progress bar that will be shown while the sync goes on.
      * @param activity The calling MainActvity
      */
-    public Sync(Activity myContextRef, ProgressBar pb, Dialog d, MainActivity activity) {
+    public Sync(Activity myContextRef, ProgressBar pb, ImageView iv, Dialog d, MainActivity activity) {
     	this.dialog = d;
     	this.activity = activity;
         this.myContextRef = myContextRef;
         pbSync = pb;
+		ivSync = iv;
         fg = 1;
     }
     
@@ -167,7 +175,7 @@ class Sync extends AsyncTask<Void, Void, Void> {
 	 */
 	protected void onProgressUpdate(Void...progress) {
 		if (doProgress){
-			if (millis + 500 < System.currentTimeMillis()) {
+			if (millis + 600 < System.currentTimeMillis()) {
 				millis = System.currentTimeMillis();
 				int idx = (int) (Math.random() * ((4) + 1));
 				tv.setText(strings[idx]);

BIN
app/src/main/res/drawable/menu.png


BIN
app/src/main/res/drawable/social_facebook.png


BIN
app/src/main/res/drawable/social_googleplus.png


BIN
app/src/main/res/drawable/social_instagram.png


BIN
app/src/main/res/drawable/social_mail.png


BIN
app/src/main/res/drawable/social_phone.png


BIN
app/src/main/res/drawable/social_twitter.png


BIN
app/src/main/res/drawable/social_whatsapp.png


BIN
app/src/main/res/drawable/social_youtube.png


+ 31 - 14
app/src/main/res/layout/activity_main.xml

@@ -19,7 +19,8 @@
 			android:layout_width="wrap_content"
 			android:layout_height="fill_parent"
 			android:nestedScrollingEnabled="false"
-			tools:ignore="UnusedAttribute">
+			tools:ignore="UnusedAttribute"
+			android:id="@+id/sv_menu">
 
 			<LinearLayout
 				android:layout_width="match_parent"
@@ -27,7 +28,8 @@
 				android:divider="@drawable/divider"
 				android:orientation="vertical"
 				android:padding="10dp"
-				android:baselineAligned="false"	>
+				android:baselineAligned="false"
+				android:id="@+id/ll_menu">
 
 				<TextView
 					android:id="@+id/menu_home"
@@ -225,29 +227,31 @@
 				android:layout_height="wrap_content"
 				android:background="@drawable/titlebar"
 				android:gravity="center_vertical"
-				android:orientation="horizontal" >
+				android:orientation="horizontal"
+				android:padding="2dp">
 
 				<!-- Button to open slider menu -->
 
 				<ImageButton
 					android:id="@+id/bt_menu"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
+					android:layout_width="40dp"
+					android:layout_height="40dp"
 					android:layout_weight=".2"
-					android:adjustViewBounds="true"
+					android:adjustViewBounds="false"
 					android:background="#00000000"
 					android:contentDescription="@string/app_name"
-					android:maxHeight="60dp"
-					android:maxWidth="60dp"
-					android:padding="2dp"
+					android:maxHeight="20dp"
+					android:maxWidth="20dp"
 					android:scaleType="fitCenter"
-					android:src="@drawable/ic_launcher" />
+					android:src="@drawable/menu"
+					android:padding="2dp"
+					android:alpha=".5"/>
 
 				<!-- Layout with the app title and current section -->
 
 				<LinearLayout
 					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
+					android:layout_height="wrap_content"
 					android:layout_gravity="center"
 					android:layout_weight=".8"
 					android:gravity="center"
@@ -275,12 +279,25 @@
 
 				</LinearLayout>
 
+				<ImageView
+					android:layout_width="40dp"
+					android:layout_height="40dp"
+					android:id="@+id/iv_logo"
+					android:src="@drawable/ic_launcher"
+					android:adjustViewBounds="true"
+					android:layout_weight=".2"
+					android:maxHeight="45dp"
+					android:maxWidth="45dp"
+					android:padding="1dp"/>
+
 				<ProgressBar
 					android:id="@+id/pb_sync"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
+					android:layout_width="40dp"
+					android:layout_height="40dp"
 					android:layout_weight=".2"
-					android:visibility="invisible" />
+					android:visibility="gone"
+					android:maxHeight="40dp"
+					android:maxWidth="40dp"/>
 
 			</LinearLayout>
 

+ 4 - 2
app/src/main/res/layout/fragment_layout_home.xml

@@ -96,7 +96,8 @@
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:background="@drawable/entry"
-				android:padding="7dp">
+				android:padding="7dp"
+				android:layout_margin="10dp">
 
 				<ImageView
 					android:layout_width="wrap_content"
@@ -105,7 +106,8 @@
 					android:contentDescription="@string/app_cdesc"
 					android:layout_weight=".4"
 					android:layout_margin="3dp"
-					android:adjustViewBounds="true"/>
+					android:adjustViewBounds="true"
+					android:maxWidth="130dp"/>
 
 				<TextView
 					android:layout_width="wrap_content"

+ 6 - 5
app/src/main/res/layout/fragment_layout_lablanca.xml

@@ -30,7 +30,7 @@
                 android:textStyle="bold"/>
 
             <LinearLayout
-                android:orientation="horizontal"
+                android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@drawable/entry"
@@ -41,18 +41,19 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/iv_lablanca_header"
                     android:contentDescription="@string/app_cdesc"
-                    android:layout_weight=".4"
                     android:layout_margin="3dp"
-                    android:adjustViewBounds="true"/>
+                    android:adjustViewBounds="true"
+                    android:layout_gravity="center_horizontal"
+                    android:maxHeight="130dp"/>
 
                 <WebView
-                    android:layout_width="wrap_content"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:id="@+id/wv_lablanca_header"
                     android:padding="7dp"
                     android:layout_marginBottom="7dp"
-                    android:layout_weight=".6"/>
+                    />
             </LinearLayout>
 
         </LinearLayout>

+ 5 - 4
app/src/main/res/layout/row_activity_past.xml

@@ -44,16 +44,17 @@
             android:layout_height="wrap_content"
             android:id="@+id/iv_row_activity_past"
             android:contentDescription="@string/app_cdesc"
-            android:maxWidth="10dp"
-            android:layout_weight=".7"
+            android:maxWidth="130dp"
+            android:layout_weight=".8"
             android:layout_margin="3dp"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:adjustViewBounds="true"/>
 
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/tv_row_activity_past_text"
-            android:layout_weight=".3"
+            android:layout_weight=".2"
             android:textAppearance="@android:style/TextAppearance.Medium"
             android:layout_margin="5dp" />
     </LinearLayout>

+ 5 - 4
app/src/main/res/layout/row_blog.xml

@@ -29,17 +29,18 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/iv_row_blog_image"
-            android:maxWidth="10dp"
+            android:maxWidth="130dp"
             android:contentDescription="@string/app_cdesc"
-            android:layout_weight=".7"
+            android:layout_weight=".8"
             android:layout_margin="3dp"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:adjustViewBounds="true"/>
 
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/tv_row_blog_text"
-            android:layout_weight=".3"
+            android:layout_weight=".2"
             android:textAppearance="@android:style/TextAppearance.Medium"
             android:layout_margin="5dp" />
     </LinearLayout>

+ 5 - 4
app/src/main/res/layout/row_home_activities.xml

@@ -36,16 +36,17 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/iv_row_home_activity"
-            android:maxWidth="10dp"
-            android:layout_weight=".7"
+            android:maxWidth="130dp"
+            android:layout_weight=".8"
             android:layout_margin="3dp"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:adjustViewBounds="true"/>
 
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/tv_row_home_activity_text"
-            android:layout_weight=".3"
+            android:layout_weight=".2"
             android:textAppearance="@android:style/TextAppearance.Medium"
             android:layout_margin="5dp" />
     </LinearLayout>

+ 3 - 2
app/src/main/res/layout/row_home_blog.xml

@@ -35,10 +35,11 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/iv_row_home_blog_image"
-            android:maxWidth="10dp"
+            android:maxWidth="130dp"
             android:layout_weight=".7"
             android:layout_margin="3dp"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:adjustViewBounds="true"/>
 
         <TextView
             android:layout_width="fill_parent"

+ 2 - 1
app/src/main/res/layout/row_home_schedule.xml

@@ -24,7 +24,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="@android:style/TextAppearance.Large"
-            android:layout_weight=".3"/>
+            android:layout_weight=".3"
+            android:maxLines="2"/>
 
         <TextView
             android:id="@+id/tv_row_home_schedule_time"