Эх сурвалжийг харах

Apex Mobile
统一导航栏title 对齐方式

Ray Zhang 8 жил өмнө
parent
commit
56c237b1c6

+ 4 - 3
Apex Mobile/app/src/main/java/com/usai/apex/AboutActivity.java

@@ -41,15 +41,16 @@ public class AboutActivity extends AppCompatActivity
 
 		TextView titleview = mActionBarView.findViewById(R.id.title);
 		titleview.setText("About");
+		setTitle("About");
 
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setDisplayShowCustomEnabled(true);
+//		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 
 
-		actionBar.setDisplayShowTitleEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 	@Override
 	protected void onCreate(Bundle savedInstanceState)

+ 4 - 3
Apex Mobile/app/src/main/java/com/usai/apex/AnnouncementActivity.java

@@ -127,15 +127,16 @@ public class AnnouncementActivity extends AppCompatActivity
 
 		TextView titleview = mActionBarView.findViewById(R.id.title);
 		titleview.setText(getIntent().getStringExtra("module_name"));
+		setTitle(getIntent().getStringExtra("module_name"));
 
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setDisplayShowCustomEnabled(true);
+//		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 
 
-		actionBar.setDisplayShowTitleEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 	@Override
 	protected void onCreate(Bundle savedInstanceState)

+ 4 - 4
Apex Mobile/app/src/main/java/com/usai/apex/ApexHistoryActivity.java

@@ -41,15 +41,15 @@ public class ApexHistoryActivity extends AppCompatActivity
 
 		TextView titleview = mActionBarView.findViewById(R.id.title);
 		titleview.setText("Apex History");
-
+		setTitle("Apex History");
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setDisplayShowCustomEnabled(true);
+//		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 
 
-		actionBar.setDisplayShowTitleEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 	@Override
 	protected void onCreate(Bundle savedInstanceState)

+ 3 - 3
Apex Mobile/app/src/main/java/com/usai/apex/ChangePasswordActivity.java

@@ -78,12 +78,12 @@ public class ChangePasswordActivity extends AppCompatActivity {
 
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setDisplayShowCustomEnabled(true);
+//		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 
 
-		actionBar.setDisplayShowTitleEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

+ 0 - 2
Apex Mobile/app/src/main/java/com/usai/apex/ContainerSearchActivity.java

@@ -14,9 +14,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
-import android.widget.RadioGroup;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.usai.util.dbUtil;
 

+ 14 - 13
Apex Mobile/app/src/main/java/com/usai/apex/DetailActivity.java

@@ -53,17 +53,17 @@ public class DetailActivity extends AppCompatActivity implements
 
 	String email_to = null,email_subject = null,email_content = null;
 	TextView mtitleview;
-	@Override
-	public void setTitle(CharSequence title) {
-//        View mActionBarView = LayoutInflater.from(this).inflate(R.layout.actionbar_customtitle, null);
+//	@Override
+//	public void setTitle(CharSequence title) {
+////        View mActionBarView = LayoutInflater.from(this).inflate(R.layout.actionbar_customtitle, null);
+////
+////        TextView mtitleviewtitleview = mActionBarView.findViewById(R.id.title);
 //
-//        TextView mtitleviewtitleview = mActionBarView.findViewById(R.id.title);
-
-		if(title==null)
-			title="";
-		if(mtitleview!=null)
-			mtitleview.setText(title);
-	}
+//		if(title==null)
+//			title="";
+//		if(mtitleview!=null)
+//			mtitleview.setText(title);
+//	}
 	private void setCustomActionBar() {
 		ActionBar.LayoutParams lp =new ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.MATCH_PARENT, Gravity.CENTER);
 		View mActionBarView = LayoutInflater.from(this).inflate(R.layout.actionbar_customtitle, null);
@@ -82,19 +82,20 @@ public class DetailActivity extends AppCompatActivity implements
 		else if(function_name.equals("Cargo Tracking"))
 			title="Cargo Detail";
 		mtitleview.setText(title);
+		setTitle(title);
 //
 //        mActionBarView.setBackgroundColor(Color.YELLOW);
 //        titleview.setBackgroundColor(Color.BLUE);
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setDisplayShowCustomEnabled(true);
+//		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 
 
 //        actionBar.setIcon(getNumberDrawable());
 //        actionBar.setDisplayShowHomeEnabled(true);
-		actionBar.setDisplayShowTitleEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 
 	public DetailActivity get_instance()

+ 4 - 4
Apex Mobile/app/src/main/java/com/usai/apex/InnerMapActivity.java

@@ -116,15 +116,15 @@ public class InnerMapActivity extends AppCompatActivity
 
 		TextView titleview = mActionBarView.findViewById(R.id.title);
 		titleview.setText("Service Location");
-
+		setTitle("Service Location");
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setDisplayShowCustomEnabled(true);
+//		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 
 
-		actionBar.setDisplayShowTitleEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 	@Override
 	protected void onCreate(Bundle savedInstanceState)

+ 4 - 3
Apex Mobile/app/src/main/java/com/usai/apex/LicenseActivity.java

@@ -28,19 +28,20 @@ public class LicenseActivity extends AppCompatActivity {
 //        else if(function_name.equals("Cargo Tracking"))
 //            title="Cargo Detail";
         mtitleview.setText(function_name);
+        setTitle(function_name);
 ////
 //        mActionBarView.setBackgroundColor(Color.YELLOW);
 //        titleview.setBackgroundColor(Color.BLUE);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setCustomView(mActionBarView, lp);
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        actionBar.setDisplayShowCustomEnabled(true);
+//        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//        actionBar.setDisplayShowCustomEnabled(true);
         actionBar.setDisplayHomeAsUpEnabled(true);
 
 
 //        actionBar.setIcon(getNumberDrawable());
 //        actionBar.setDisplayShowHomeEnabled(true);
-        actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowTitleEnabled(true);
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {

+ 14 - 13
Apex Mobile/app/src/main/java/com/usai/apex/Result/AMResultActivity.java

@@ -60,31 +60,32 @@ public class AMResultActivity extends SearchResultActivity {
         mtitleview= mActionBarView.findViewById(R.id.title);
         String title = mParams.getString("title");
         mtitleview.setText(title);
+        setTitle(title);
 //
 //        mActionBarView.setBackgroundColor(Color.YELLOW);
 //        titleview.setBackgroundColor(Color.BLUE);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setCustomView(mActionBarView, lp);
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        actionBar.setDisplayShowCustomEnabled(true);
+//        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//        actionBar.setDisplayShowCustomEnabled(true);
         actionBar.setDisplayHomeAsUpEnabled(true);
 
 
 //        actionBar.setIcon(getNumberDrawable());
 //        actionBar.setDisplayShowHomeEnabled(true);
-        actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowTitleEnabled(true);
     }
-    @Override
-    public void setTitle(CharSequence title) {
-//        View mActionBarView = LayoutInflater.from(this).inflate(R.layout.actionbar_customtitle, null);
+//    @Override
+//    public void setTitle(CharSequence title) {
+////        View mActionBarView = LayoutInflater.from(this).inflate(R.layout.actionbar_customtitle, null);
+////
+////        TextView mtitleviewtitleview = mActionBarView.findViewById(R.id.title);
 //
-//        TextView mtitleviewtitleview = mActionBarView.findViewById(R.id.title);
-
-        if(title==null)
-            title="";
-        if(mtitleview!=null)
-            mtitleview.setText(title);
-    }
+//        if(title==null)
+//            title="";
+//        if(mtitleview!=null)
+//            mtitleview.setText(title);
+//    }
     @Override
     protected void loadData() {
         if (mParams.getString("columns") == null) {

+ 4 - 3
Apex Mobile/app/src/main/java/com/usai/apex/RetrievePasswordActivity.java

@@ -76,15 +76,16 @@ public class RetrievePasswordActivity extends AppCompatActivity
 
 		TextView titleview = mActionBarView.findViewById(R.id.title);
 		titleview.setText("Retrieve Password");
+		setTitle("Retrieve Password");
 
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setDisplayShowCustomEnabled(true);
+//		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 
 
-		actionBar.setDisplayShowTitleEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 	@Override
 	protected void onCreate(Bundle savedInstanceState)

+ 6 - 4
Apex Mobile/app/src/main/java/com/usai/apex/SearchListActivity.java

@@ -96,19 +96,21 @@ public class SearchListActivity extends AppCompatActivity implements OnClickList
 
         TextView titleview = mActionBarView.findViewById(R.id.title);
         titleview.setText(getIntent().getStringExtra("title"));
+
+        setTitle(getIntent().getStringExtra("title"));
 //
 //        mActionBarView.setBackgroundColor(Color.YELLOW);
 //        titleview.setBackgroundColor(Color.BLUE);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setCustomView(mActionBarView, lp);
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        actionBar.setDisplayShowCustomEnabled(true);
+//        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//        actionBar.setDisplayShowCustomEnabled(true);
         actionBar.setDisplayHomeAsUpEnabled(true);
 
 
 //        actionBar.setIcon(getNumberDrawable());
 //        actionBar.setDisplayShowHomeEnabled(true);
-        actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowTitleEnabled(true);
     }
     @Override
 	protected void onCreate(Bundle savedInstanceState)
@@ -127,7 +129,7 @@ public class SearchListActivity extends AppCompatActivity implements OnClickList
 //		actionBar.setHomeButtonEnabled(true);
 //		actionBar.setDisplayHomeAsUpEnabled(false);
 //		actionBar.setHomeActionContentDescription("Return");
-////		actionBar.setDisplayShowTitleEnabled(false);
+////		actionBar.setDisplayShowTitleEnabled(true);
 //
 
 		user = ApexTrackingApplication.get_user();

+ 1 - 1
Apex Mobile/app/src/main/java/com/usai/apex/TestAppComActivity.java

@@ -29,7 +29,7 @@ public class TestAppComActivity extends AppCompatActivity {
         actionBar.setDisplayShowHomeEnabled(true);
 //        actionBar.setHomeAsUpIndicator(R.drawable.ic_launcher);
         actionBar.setDisplayHomeAsUpEnabled(false);
-        actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowTitleEnabled(true);
 
 
 //        actionBar.add

+ 3 - 3
Apex Mobile/app/src/main/java/com/usai/apex/WebActivity.java

@@ -40,12 +40,12 @@ public class WebActivity extends AppCompatActivity
 
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setDisplayShowCustomEnabled(true);
+//		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 
 
-		actionBar.setDisplayShowTitleEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 	@Override
 	protected void onCreate(Bundle savedInstanceState)

+ 4 - 3
Apex Mobile/app/src/main/java/com/usai/apex/pdf/PDFPreviewActivity.java

@@ -200,19 +200,20 @@ public class PDFPreviewActivity extends AppCompatActivity implements OnPageChang
         TextView mtitleview= mActionBarView.findViewById(R.id.title);
 //        String title = mParams.getString("title");
         mtitleview.setText(title);
+        setTitle(title);
 //
 //        mActionBarView.setBackgroundColor(Color.YELLOW);
 //        titleview.setBackgroundColor(Color.BLUE);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setCustomView(mActionBarView, lp);
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        actionBar.setDisplayShowCustomEnabled(true);
+//        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//        actionBar.setDisplayShowCustomEnabled(true);
         actionBar.setDisplayHomeAsUpEnabled(true);
 
 
 //        actionBar.setIcon(getNumberDrawable());
 //        actionBar.setDisplayShowHomeEnabled(true);
-        actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowTitleEnabled(true);
     }
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {

+ 5 - 3
Apex Mobile/app/src/main/java/com/usai/apex/saved/CheckSavedActivity.java

@@ -120,19 +120,21 @@ public class CheckSavedActivity extends AppCompatActivity {
 
         TextView titleview = mActionBarView.findViewById(R.id.title);
         titleview.setText(getIntent().getStringExtra("function_name"));
+
+        setTitle(getIntent().getStringExtra("function_name"));
 //
 //        mActionBarView.setBackgroundColor(Color.YELLOW);
 //        titleview.setBackgroundColor(Color.BLUE);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setCustomView(mActionBarView, lp);
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        actionBar.setDisplayShowCustomEnabled(true);
+//        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+//        actionBar.setDisplayShowCustomEnabled(true);
         actionBar.setDisplayHomeAsUpEnabled(true);
 
 
 //        actionBar.setIcon(getNumberDrawable());
 //        actionBar.setDisplayShowHomeEnabled(true);
-        actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowTitleEnabled(true);
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {