Skip to content

fix:Connection Settings on login screen doesn't feel clickable #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2017
Merged

fix:Connection Settings on login screen doesn't feel clickable #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
Expand Down Expand Up @@ -57,7 +58,7 @@ public class LoginActivity extends MifosBaseActivity implements LoginMvpView {
TextView tv_full_url;

@BindView(R.id.bt_connectionSettings)
TextView bt_connectionSettings;
Button bt_connectionSettings;

@BindView(R.id.et_tenantIdentifier)
EditText et_tenantIdentifier;
Expand Down
4 changes: 2 additions & 2 deletions mifosng-android/src/main/res/layout/activity_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
android:nextFocusDown="@+id/bt_login" />
</android.support.design.widget.TextInputLayout>

<TextView
<android.support.v7.widget.AppCompatButton
android:id="@+id/bt_connectionSettings"
style="@style/TextView.ConnectionSettings" />
style="@style/Button.ConnectionSettings" />

<LinearLayout
android:id="@+id/ll_connectionSettings"
Expand Down
6 changes: 6 additions & 0 deletions mifosng-android/src/main/res/values/styles_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
<item name="android:layout_width">0dp</item>
</style>

<style name="Button.ConnectionSettings">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">10dp</item>
<item name="android:text">"Connection settings"</item>
</style>

<style name="Button.Login" parent="Button.Base">
<item name="android:layout_width">match_parent</item>
Expand Down
7 changes: 0 additions & 7 deletions mifosng-android/src/main/res/values/styles_text.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@
<item name="android:layout_marginLeft">10dp</item>
</style>

<style name="TextView.ConnectionSettings" parent="TextView.Base">
<item name="android:layout_marginLeft">5dp</item>
<item name="android:layout_marginTop">10dp</item>
<item name="android:text">"Connection settings"</item>
<item name="android:textColor">@color/primary</item>
</style>

<style name="TextView.Search" parent="TextView.Base">
<item name="android:layout_marginTop">10dp</item>
<item name="android:layout_marginBottom">10dp</item>
Expand Down