Skip to content
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

Jump to bottom

Fixed Label fragment background color mismatch #80

Merged
merged 1 commit into from
Jun 27, 2017
Merged

Fixed Label fragment background color mismatch #80

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
1 change: 0 additions & 1 deletion app/src/main/java/com/procleus/brime/login/SigninActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.procleus.brime.R;
import com.procleus.brime.utils.CustomButton;
import com.procleus.brime.utils.CustomEditText;
import com.basgeekball.awesomevalidation.AwesomeValidation;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.UnsupportedEncodingException;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/procleus/brime/ui/LabelsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
public class LabelsFragment extends Fragment {

private ArrayList<String> labelsRetrieved;
private static ListView listView;
private ListView listView;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change required

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to fix memory leak and instant run feature ;)

EditText editText;

@Override
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/procleus/brime/ui/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ public void onBackPressed() {
}
else {
if (back_pressed + TIME_DELAY > System.currentTimeMillis()) {
android.os.Process.killProcess(android.os.Process.myPid());
super.onBackPressed();
// android.os.Process.killProcess(android.os.Process.myPid());
} else {
Toast.makeText(getBaseContext(), "Press once again to exit!",
Toast.LENGTH_SHORT).show();
Expand Down
5 changes: 1 addition & 4 deletions app/src/main/res/layout/labels_gragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:background="#efefef"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/addLabelInputLayout"
android:orientation="horizontal"
android:padding="12dp"
android:background="#efefef"
android:layout_alignParentTop="true">
<com.procleus.brime.utils.CustomEditText
style="@style/textInputLeftAlign"
android:layout_weight="9"
android:hint="@string/labels_addlabels"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/addLabelInput"
Expand All @@ -36,7 +34,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/listLabel"
android:background="#ffffff"
android:padding="8dp"
android:layout_below="@id/addLabelInputLayout"
/>
Expand Down