Skip to content

FinishingTouch #5

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

Open
Sidrti wants to merge 2 commits into
base: main
Choose a base branch
from
Open

FinishingTouch #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f15345
FinishingTouch
Sidrti Feb 16, 2021
28d210e
Merge branch 'main' into KillProcess-TilesBugLeft
Sidrti Feb 16, 2021
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
30 changes: 14 additions & 16 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,18 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.example.seniorcitizensimulator">

<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.VIBRATE" />

<application

android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.SeniorCitizenSimulator"
tools:replace="android:theme">

<activity android:name=".RingingActivity"></activity>
<activity
android:name=".SupportActivity"
android:screenOrientation="landscape" />

<activity
android:name=".TryingActivity"
android:screenOrientation="landscape" />
Expand All @@ -55,5 +40,18 @@
</intent-filter>
</service>
</application>
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

<uses-permission android:name="android.permission.VIBRATE" />

</manifest>
4 changes: 3 additions & 1 deletion app/src/main/java/com/example/seniorcitizensimulator/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ protected void onCreate(Bundle savedInstanceState) {

Intent success = new Intent(LoginActivity.this, TryingActivity.class);
success.putExtra("Login", file_retreive());
success.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(success);

finish();
Expand Down Expand Up @@ -125,7 +126,7 @@ else if(Password.getText().toString().trim().equalsIgnoreCase("")){

public void StartProcessLogin(){
//progdialog();
String url = "https://pula.tech/connectapi/AndroidApi/login.php?emailId="+Username.getText().toString()+"&password="+Password.getText().toString();
String url = "https://meety.se/api/AndroidApi/login.php?emailId="+Username.getText().toString()+"&password="+Password.getText().toString();

FetchFromDB asyncTask = (FetchFromDB) new FetchFromDB(url,new FetchFromDB.AsyncResponse()
{
Expand Down Expand Up @@ -161,6 +162,7 @@ public void ConvertFromJSON(String json){
Log.e("JSONARRAY", jsonArray.toString());

for (int i = 0; i < jsonArray.length(); i++) {

JSONObject obj = jsonArray.getJSONObject(i);
file_write_url(obj.getString("id"));
file_write_firstname(obj.getString("firstName"));
Expand Down
21 changes: 21 additions & 0 deletions app/src/main/java/com/example/seniorcitizensimulator/RingingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.example.seniorcitizensimulator;

import androidx.appcompat.app.AppCompatActivity;

import android.content.Intent;
import android.os.Bundle;
import android.widget.TextView;

public class RingingActivity extends AppCompatActivity {
TextView tvName;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_ringing);
Intent intent = getIntent();
String name = intent.getStringExtra("name");
tvName=findViewById(R.id.tvName);
tvName.setText(name);
}
}
Loading