Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

All top bars with titles now look the same

Browse source
This commit is contained in:
Sylvain Berfini 2018-12-12 14:49:46 +01:00
parent a1619b24f1
commit 134123358b
7 changed files with 43 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/org/linphone/assistant/AssistantActivity.java
View file

@ -92,7 +92,7 @@ public class AssistantActivity extends Activity
public DialPlan country; public DialPlan country;
private ImageView mBack, mCancel; private ImageView mBack /*, mCancel*/;
private AssistantFragmentsEnum mCurrentFragment; private AssistantFragmentsEnum mCurrentFragment;
private AssistantFragmentsEnum mLastFragment; private AssistantFragmentsEnum mLastFragment;
private AssistantFragmentsEnum mFirstFragment; private AssistantFragmentsEnum mFirstFragment;
@ -280,8 +280,8 @@ public class AssistantActivity extends Activity
private void initUI() { private void initUI() {
mBack = findViewById(R.id.back); mBack = findViewById(R.id.back);
mBack.setOnClickListener(this); mBack.setOnClickListener(this);
mCancel = findViewById(R.id.assistant_cancel); // mCancel = findViewById(R.id.assistant_cancel);
mCancel.setOnClickListener(this); // mCancel.setOnClickListener(this);
} }
private void changeFragment(Fragment newFragment) { private void changeFragment(Fragment newFragment) {
@ -296,7 +296,7 @@ public class AssistantActivity extends Activity
int id = v.getId(); int id = v.getId();
boolean firstLaunch = LinphonePreferences.instance().isFirstLaunch(); boolean firstLaunch = LinphonePreferences.instance().isFirstLaunch();
if (id == R.id.assistant_cancel) { /*if (id == R.id.assistant_cancel) {
hideKeyboard(); hideKeyboard();
LinphonePreferences.instance().firstLaunchSuccessful(); LinphonePreferences.instance().firstLaunchSuccessful();
if (getResources().getBoolean(R.bool.assistant_cancel_move_to_back)) { if (getResources().getBoolean(R.bool.assistant_cancel_move_to_back)) {
@ -305,11 +305,23 @@ public class AssistantActivity extends Activity
if (firstLaunch) startActivity(new Intent().setClass(this, LinphoneActivity.class)); if (firstLaunch) startActivity(new Intent().setClass(this, LinphoneActivity.class));
finish(); finish();
} }
} else if (id == R.id.back) { } else*/
if (id == R.id.back) {
hideKeyboard(); hideKeyboard();
if (mCurrentFragment == AssistantFragmentsEnum.WELCOME) {
LinphonePreferences.instance().firstLaunchSuccessful();
if (getResources().getBoolean(R.bool.assistant_cancel_move_to_back)) {
moveTaskToBack(true);
} else {
if (firstLaunch)
startActivity(new Intent().setClass(this, LinphoneActivity.class));
finish();
}
} else {
onBackPressed(); onBackPressed();
} }
} }
}
@Override @Override
public void onBackPressed() { public void onBackPressed() {
@ -427,7 +439,7 @@ public class AssistantActivity extends Activity
changeFragment(fragment); changeFragment(fragment);
mCurrentFragment = AssistantFragmentsEnum.ECHO_CANCELLER_CALIBRATION; mCurrentFragment = AssistantFragmentsEnum.ECHO_CANCELLER_CALIBRATION;
mBack.setVisibility(View.VISIBLE); mBack.setVisibility(View.VISIBLE);
mCancel.setEnabled(false); mBack.setEnabled(false);
} else { } else {
checkAndRequestAudioPermission(); checkAndRequestAudioPermission();
} }
@ -529,14 +541,12 @@ public class AssistantActivity extends Activity
changeFragment(mFragment); changeFragment(mFragment);
country = null; country = null;
mCurrentFragment = AssistantFragmentsEnum.WELCOME; mCurrentFragment = AssistantFragmentsEnum.WELCOME;
mBack.setVisibility(View.INVISIBLE);
} }
public void displayLoginGeneric() { public void displayLoginGeneric() {
mFragment = new LoginFragment(); mFragment = new LoginFragment();
changeFragment(mFragment); changeFragment(mFragment);
mCurrentFragment = AssistantFragmentsEnum.LOGIN; mCurrentFragment = AssistantFragmentsEnum.LOGIN;
mBack.setVisibility(View.VISIBLE);
} }
public void displayLoginLinphone(String username, String password) { public void displayLoginLinphone(String username, String password) {
@ -549,7 +559,6 @@ public class AssistantActivity extends Activity
mFragment.setArguments(extras); mFragment.setArguments(extras);
changeFragment(mFragment); changeFragment(mFragment);
mCurrentFragment = AssistantFragmentsEnum.LINPHONE_LOGIN; mCurrentFragment = AssistantFragmentsEnum.LINPHONE_LOGIN;
mBack.setVisibility(View.VISIBLE);
} }
public void displayCreateAccount() { public void displayCreateAccount() {
@ -560,7 +569,6 @@ public class AssistantActivity extends Activity
mFragment.setArguments(extra); mFragment.setArguments(extra);
changeFragment(mFragment); changeFragment(mFragment);
mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT; mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT;
mBack.setVisibility(View.VISIBLE);
} }
public void displayRemoteProvisioning(String url) { public void displayRemoteProvisioning(String url) {
@ -570,7 +578,6 @@ public class AssistantActivity extends Activity
mFragment.setArguments(extra); mFragment.setArguments(extra);
changeFragment(mFragment); changeFragment(mFragment);
mCurrentFragment = AssistantFragmentsEnum.REMOTE_PROVISIONING; mCurrentFragment = AssistantFragmentsEnum.REMOTE_PROVISIONING;
mBack.setVisibility(View.VISIBLE);
} }
public void displayQRCodeReader() { public void displayQRCodeReader() {
@ -581,7 +588,6 @@ public class AssistantActivity extends Activity
mFragment = new QrCodeFragment(); mFragment = new QrCodeFragment();
changeFragment(mFragment); changeFragment(mFragment);
mCurrentFragment = AssistantFragmentsEnum.QRCODE_READER; mCurrentFragment = AssistantFragmentsEnum.QRCODE_READER;
mBack.setVisibility(View.VISIBLE);
} }
} }
@ -590,7 +596,6 @@ public class AssistantActivity extends Activity
changeFragment(mFragment); changeFragment(mFragment);
mLastFragment = mCurrentFragment; mLastFragment = mCurrentFragment;
mCurrentFragment = AssistantFragmentsEnum.COUNTRY_CHOOSER; mCurrentFragment = AssistantFragmentsEnum.COUNTRY_CHOOSER;
mBack.setVisibility(View.VISIBLE);
} }
private void launchDownloadCodec() { private void launchDownloadCodec() {
@ -603,8 +608,7 @@ public class AssistantActivity extends Activity
CodecDownloaderFragment codecFragment = new CodecDownloaderFragment(); CodecDownloaderFragment codecFragment = new CodecDownloaderFragment();
changeFragment(codecFragment); changeFragment(codecFragment);
mCurrentFragment = AssistantFragmentsEnum.DOWNLOAD_CODEC; mCurrentFragment = AssistantFragmentsEnum.DOWNLOAD_CODEC;
mBack.setVisibility(View.VISIBLE); mBack.setEnabled(false);
mCancel.setEnabled(false);
} else goToLinphoneActivity(); } else goToLinphoneActivity();
} else { } else {
goToLinphoneActivity(); goToLinphoneActivity();
@ -706,7 +710,6 @@ public class AssistantActivity extends Activity
changeFragment(fragment); changeFragment(fragment);
mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT_ACTIVATION; mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT_ACTIVATION;
mBack.setVisibility(View.INVISIBLE);
} }
public void displayAssistantCodeConfirm( public void displayAssistantCodeConfirm(
@ -723,7 +726,6 @@ public class AssistantActivity extends Activity
changeFragment(fragment); changeFragment(fragment);
mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT_CODE_ACTIVATION; mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT_CODE_ACTIVATION;
mBack.setVisibility(View.INVISIBLE);
} }
public void displayAssistantLinphoneLogin(String phone, String dialcode) { public void displayAssistantLinphoneLogin(String phone, String dialcode) {
@ -736,7 +738,6 @@ public class AssistantActivity extends Activity
changeFragment(fragment); changeFragment(fragment);
mCurrentFragment = AssistantFragmentsEnum.LINPHONE_LOGIN; mCurrentFragment = AssistantFragmentsEnum.LINPHONE_LOGIN;
mBack.setVisibility(View.VISIBLE);
} }
public void isAccountVerified() { public void isAccountVerified() {

2
app/src/main/res/layout-land/main.xml
View file

@ -44,7 +44,7 @@
style="@style/font1" style="@style/font1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.4" android:layout_weight="0.6"
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:padding="15dp" /> android:padding="15dp" />

2
app/src/main/res/layout-sw533dp-land/main.xml
View file

@ -44,7 +44,7 @@
style="@style/font1" style="@style/font1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.4" android:layout_weight="0.6"
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:padding="15dp" /> android:padding="15dp" />

2
app/src/main/res/layout-sw533dp/main.xml
View file

@ -44,7 +44,7 @@
style="@style/font1" style="@style/font1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.4" android:layout_weight="0.6"
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:padding="15dp" /> android:padding="15dp" />

16
app/src/main/res/layout/assistant_topbar.xml
View file

@ -18,15 +18,21 @@
android:src="@drawable/back" /> android:src="@drawable/back" />
<TextView <TextView
style="@style/font8" style="@style/font1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.6" android:layout_weight="0.6"
android:background="@drawable/toolbar_button"
android:gravity="center" android:gravity="center"
android:text="@string/assistant" /> android:maxLines="1"
android:padding="15dp"
android:text="@string/assistant"/>
<ImageView <View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2" />
<!--<ImageView
android:id="@+id/assistant_cancel" android:id="@+id/assistant_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -34,6 +40,6 @@
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_dialer_back" android:contentDescription="@string/content_description_dialer_back"
android:padding="15dp" android:padding="15dp"
android:src="@drawable/dialer_back" /> android:src="@drawable/dialer_back" />-->
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/main.xml
View file

@ -44,7 +44,7 @@
style="@style/font1" style="@style/font1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.4" android:layout_weight="0.6"
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:padding="15dp" /> android:padding="15dp" />

10
app/src/main/res/layout/recordings_list.xml
View file

@ -22,10 +22,16 @@
android:padding="18dp" android:padding="18dp"
android:src="@drawable/back" /> android:src="@drawable/back" />
<View <TextView
android:id="@+id/top_bar_title"
style="@style/font1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.6" /> android:layout_weight="0.6"
android:gravity="center"
android:maxLines="1"
android:padding="15dp"
android:text="@string/menu_recordings"/>
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"