diff --git a/app/build.gradle b/app/build.gradle index 9dda90c..ba58439 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "29.0.3" defaultConfig { applicationId "com.ShanMukhaInnovations.ArrestTB" - minSdkVersion 16 + minSdkVersion 19 targetSdkVersion 29 versionCode 1 versionName "1.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a3651a8..e92ef85 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,11 +9,23 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + + android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + + + + @@ -26,6 +38,8 @@ + + diff --git a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Camera_Guide.java b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Camera_Guide.java index e467c2e..7789aee 100644 --- a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Camera_Guide.java +++ b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Camera_Guide.java @@ -1,9 +1,13 @@ package com.ShanMukhaInnovations.ArrestTB; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import android.Manifest; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -26,25 +30,15 @@ public class Camera_Guide extends AppCompatActivity { setContentView(R.layout.activity_camera__guide); Intro=findViewById(R.id.intro); - patientdob= getIntent().getStringExtra("dob_report"); - patientid=getIntent().getStringExtra("id_report"); - patientage=getIntent().getStringExtra("age_report"); - patientnikshayid=getIntent().getStringExtra("nikshay_report"); - Log.d(patientid,"vvvvvvvvvvvvvvvv"); Intro.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + Intent intent = new Intent(getApplicationContext(),AddImage.class ); - intent.putExtra("dob_report",patientdob); - intent.putExtra("id_report",patientid); - - intent.putExtra("age_report",patientage); - intent.putExtra("nikshay_report",patientnikshayid); - - startActivity(intent); + startActivity(intent); savePrefsData(); finish(); diff --git a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/FontAwesome.java b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/FontAwesome.java index 1f4b434..02ed4da 100644 --- a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/FontAwesome.java +++ b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/FontAwesome.java @@ -27,7 +27,6 @@ public class FontAwesome extends AppCompatTextView { private void init() { - //Font name should not contain "/". Typeface tf = Typeface.createFromAsset(getContext().getAssets(), "fa-solid-900.ttf"); setTypeface(tf); diff --git a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Navigation_Top.java b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Navigation_Top.java index 204a0e0..85399fe 100644 --- a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Navigation_Top.java +++ b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Navigation_Top.java @@ -44,7 +44,7 @@ public class Navigation_Top extends AppCompatActivity implements NavigationView. @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); setContentView(R.layout.activity_navigation__top); diff --git a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Patient_detail.java b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Patient_detail.java index 1f8ceb2..b2a2dfb 100644 --- a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Patient_detail.java +++ b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Patient_detail.java @@ -9,6 +9,8 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -18,6 +20,7 @@ import android.widget.Button; import android.widget.DatePicker; import android.widget.EditText; import android.widget.Spinner; +import android.widget.Toast; import java.util.Calendar; @@ -42,13 +45,19 @@ public class Patient_detail extends Navigation_Top implements AdapterView.OnItem patient_ID=findViewById(R.id.patientid); Age=findViewById(R.id.age); NikshayId=findViewById(R.id.NikshayID); + /* patient_ID.addTextChangedListener(loginTextWatcher); + Age.addTextChangedListener(loginTextWatcher); + NikshayId.addTextChangedListener(loginTextWatcher); +*/ ArrayAdapter adapter = ArrayAdapter.createFromResource(this, R.array.Gender, android.R.layout.simple_spinner_item); mDisplayDate.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + mDisplayDate.setEnabled(true); + Calendar cal = Calendar.getInstance(); int year = cal.get(Calendar.YEAR); int month = cal.get(Calendar.MONTH); @@ -87,32 +96,33 @@ public class Patient_detail extends Navigation_Top implements AdapterView.OnItem next_act.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - patientid=patient_ID.getText().toString(); -patientage=Age.getText().toString(); - patientnikshayid=NikshayId.getText().toString(); - SharedPreferences preferences=getSharedPreferences("PhoneBook",MODE_PRIVATE); - SharedPreferences.Editor editor=preferences.edit(); + patientid = patient_ID.getText().toString(); + patientage = Age.getText().toString(); + patientnikshayid = NikshayId.getText().toString(); + if (patientid.equals("") || patientage.equals("") || patientnikshayid.equals("")) { + Toast.makeText(Patient_detail.this, "Please fill all fields", Toast.LENGTH_SHORT).show(); - // editor.putString(Name, phonenum); - editor.putString("gender", gender); - editor.putString("patientid", patientid); - editor.putString("patientage", patientage); - editor.putString("patientnikshayid", patientnikshayid); - editor.putString("dob", patientdob); + } else { + + SharedPreferences preferences = getSharedPreferences("PhoneBook", MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); + + // editor.putString(Name, phonenum); + editor.putString("gender", gender); + editor.putString("patientid", patientid); + editor.putString("patientage", patientage); + editor.putString("patientnikshayid", patientnikshayid); + editor.putString("dob", patientdob); + editor.commit(); + Intent intent = new Intent(Patient_detail.this, Test_details.class); - - editor.commit(); - - - Intent intent=new Intent (Patient_detail.this,Test_details.class); - - - startActivity(intent); + startActivity(intent); + } } }); } @@ -132,4 +142,18 @@ patientage=Age.getText().toString(); public void onNothingSelected(AdapterView parent) { } + + /*private TextWatcher loginTextWatcher = new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + next_act.setEnabled(!patientid.isEmpty() && !patientage.isEmpty() && !patientnikshayid.isEmpty()); + } + @Override + public void afterTextChanged(Editable s) { + } + };*/ } diff --git a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Report.java b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Report.java index ad69a12..38cf45c 100644 --- a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Report.java +++ b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Report.java @@ -1,40 +1,66 @@ package com.ShanMukhaInnovations.ArrestTB; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; +import android.Manifest; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.pdf.PdfDocument; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; +import android.os.Environment; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; +import android.widget.ImageButton; import android.widget.TextView; +import android.widget.Toast; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; -public class Report extends Navigation_Top { +public class Report extends AppCompatActivity { TextView patient_id,patient_dob,patientnikshayid,agepatient,patientgender,patientsample,validatyd,spintubeid,nirtlab,dated,timed,resultd; + ImageButton shared ,dowbloadd; + String string1,string2,string3,string4,string5,string6,string7,string8,string9,date,time; + File filePath=null; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.activity_report); + /* super.onCreate(savedInstanceState); LayoutInflater inflater = (LayoutInflater) this .getSystemService(Context.LAYOUT_INFLATER_SERVICE); View contentView = inflater.inflate(R.layout.activity_report, null, false); draw.addView(contentView, 0); +*/ - - // setContentView(R.layout.activity_report); + setContentView(R.layout.activity_report); + shared=findViewById(R.id.share); + dowbloadd=findViewById(R.id.downlaod); patient_id=findViewById(R.id.patient_idr); patient_dob=findViewById(R.id.patien_dobr); patientnikshayid=findViewById(R.id.patient_nikshayidr); agepatient=findViewById(R.id.patient_ager); - String date = String.valueOf(android.text.format.DateFormat.format("dd-MM-yyyy", new java.util.Date())); + date = String.valueOf(android.text.format.DateFormat.format("dd-MM-yyyy", new java.util.Date())); DateFormat df = new SimpleDateFormat("h:mm a"); - String time = df.format(Calendar.getInstance().getTime()); + time = df.format(Calendar.getInstance().getTime()); patientgender=findViewById(R.id.patient_genderr); patientsample=findViewById(R.id.patient_typesampler); @@ -52,18 +78,81 @@ public class Report extends Navigation_Top { SharedPreferences preferences=getSharedPreferences("PhoneBook",MODE_PRIVATE); - String string1 = preferences.getString("gender", null); - String string2 = preferences.getString("patientid", null); - String string3 = preferences.getString("patientage", null); - String string4 = preferences.getString("patientnikshayid", null); - String string5 = preferences.getString("dob", null); + string1 = preferences.getString("gender", null); + string2 = preferences.getString("patientid", null); + string3 = preferences.getString("patientage", null); + string4 = preferences.getString("patientnikshayid", null); + string5 = preferences.getString("dob", null); + SharedPreferences preferences1=getSharedPreferences("PhoneBook1",MODE_PRIVATE); - String string6 = preferences1.getString("NIRTLabde", null); - String string7 = preferences1.getString("SPINTubeIDde", null); - String string8 = preferences1.getString("sample", null); - String string9 = preferences1.getString("validity", null); + string6 = preferences1.getString("NIRTLabde", null); + string7 = preferences1.getString("SPINTubeIDde", null); + string8 = preferences1.getString("sample", null); + string9 = preferences1.getString("validity", null); + + shared.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if(ContextCompat.checkSelfPermission(Report.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED) + { + + ActivityCompat.requestPermissions(Report.this,new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},23); + } + else + { + createPdf(); + + Intent intent=new Intent(Intent.ACTION_SEND); + intent.putExtra(Intent.EXTRA_TEXT,"Report"); + if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N) { + Uri path= FileProvider.getUriForFile(Report.this,"com.ShanMukhaInnovations.ArrestTB.fileprovider",filePath); + intent.putExtra(Intent.EXTRA_STREAM,path); + } + else{ + + intent.putExtra(Intent.EXTRA_STREAM,Uri.fromFile(filePath)); + } + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + intent.setType("application/pdf"); + startActivity(intent); + + //startCropImageActivity(); + // createPdf(editText.getText().toString()); + + + } + //now for sharing file i need to create file provider for android version greater than noughat let's do it + + + //Everything WOrking + + + } + }); + + dowbloadd.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if(ContextCompat.checkSelfPermission(Report.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED) + { + + ActivityCompat.requestPermissions(Report.this,new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},23); + } + else + { + //startCropImageActivity(); + createPdf(); + Toast.makeText(Report.this, "File Downloaded", Toast.LENGTH_LONG).show(); + + + + } + } + + }); + patient_id.setText(string2); patient_dob.setText(string5); @@ -84,4 +173,130 @@ validatyd.setText(string9); } + private void createPdf(){ + // create a new document + PdfDocument document = new PdfDocument(); + + // crate a page description + PdfDocument.PageInfo pageInfo = new PdfDocument.PageInfo.Builder(1000, 2000, 1).create(); + + // start a page + PdfDocument.Page page = document.startPage(pageInfo); + Canvas canvas = page.getCanvas(); + Paint paint = new Paint(); + paint.setTextSize(80); + canvas.drawText("Arrest Tb",40,80,paint); + paint.setTextSize(30); + canvas.drawText("ShanMukha Innovations Pvt Ltd",30,120,paint); + paint.setTextAlign(Paint.Align.RIGHT); + canvas.drawText(date,canvas.getWidth()-40,40,paint); + canvas.drawText(time,canvas.getWidth()-40,80,paint); + paint.setTextAlign(Paint.Align.LEFT); + paint.setColor(Color.rgb(150,150,150)); + canvas.drawRect(30,250,canvas.getWidth()-30,300,paint); + paint.setColor(Color.WHITE); + canvas.drawText("Result",50,285,paint); + // canvas.drawText("name 2",450,435,paint); + paint.setTextAlign(Paint.Align.RIGHT); + canvas.drawText("POSITIVE",canvas.getWidth()-40,285,paint); + paint.setTextAlign(Paint.Align.LEFT); + + + paint.setColor(Color.rgb(150,150,150)); + // canvas.drawRect(30,150,canvas.getWidth()-30,160,paint); + + + canvas.drawRect(30,400,canvas.getWidth()-30,450,paint); + paint.setColor(Color.WHITE); + canvas.drawText("Patient ID",50,435,paint); + canvas.drawText("Patient Gender",450,435,paint); + paint.setTextAlign(Paint.Align.RIGHT); + canvas.drawText("Date of Birth",canvas.getWidth()-40,435,paint); + paint.setTextAlign(Paint.Align.LEFT); + paint.setColor(Color.BLACK); + + canvas.drawText(string2,50,480,paint); + canvas.drawText(string1,450,480,paint); + paint.setTextAlign(Paint.Align.RIGHT); + canvas.drawText(string5+".",canvas.getWidth()-40,480,paint); + + paint.setTextAlign(Paint.Align.RIGHT); + + paint.setColor(Color.rgb(150,150,150)); + // canvas.drawRect(30,150,canvas.getWidth()-30,160,paint); + + // canvas.drawRect(30,550,canvas.getWidth()-30,560,paint); + canvas.drawRect(30,570,canvas.getWidth()-30,620,paint); + + + paint.setColor(Color.WHITE); + canvas.drawText("Age",100,605,paint); + canvas.drawText("Nikshay ID ",540,605,paint); + paint.setTextAlign(Paint.Align.RIGHT); + canvas.drawText("NIRT Lab Number",canvas.getWidth()-40,605,paint); + paint.setTextAlign(Paint.Align.LEFT); + paint.setColor(Color.BLACK); + + canvas.drawText(string3,50,650,paint); + canvas.drawText(string4,440,650,paint); + paint.setTextAlign(Paint.Align.RIGHT); + canvas.drawText(string6,canvas.getWidth()-40,650,paint); + + paint.setTextAlign(Paint.Align.RIGHT); + paint.setColor(Color.rgb(150,150,150)); + + canvas.drawRect(30,740,canvas.getWidth()-30,790,paint); + + paint.setColor(Color.WHITE); + canvas.drawText("SPIN Tube ID",220,775,paint); + canvas.drawText("Type of Sample",540,775,paint); + paint.setTextAlign(Paint.Align.RIGHT); + canvas.drawText("Tube Validity",canvas.getWidth()-40,775,paint); + paint.setTextAlign(Paint.Align.LEFT); + paint.setColor(Color.BLACK); + + canvas.drawText(string7,50,820,paint); + canvas.drawText(string8,440,820,paint); + paint.setTextAlign(Paint.Align.RIGHT); + canvas.drawText(string9,canvas.getWidth()-40,820,paint); + + paint.setTextAlign(Paint.Align.RIGHT); + paint.setColor(Color.rgb(150,150,150)); + + // finish the page + document.finishPage(page); + /* File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"Raman.pdf"); + + + // write the document content + *//*String directory_path = Environment.getExternalStorageDirectory().getPath() + "/ArrestTb/"; + File file = new File(directory_path); + if (!file.exists()) { + file.mkdirs(); + }*//* + // String targetPdf = directory_path+"Report_"+string2+".pdf"; + filePath = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"Report_"+string2+".pdf"); +*/ + String directory_path = Environment.getExternalStorageDirectory().getPath() + "/ArrestTb/"; + File file = new File(directory_path); + if (!file.exists()) { + file.mkdirs(); + } + String targetPdf = directory_path+"Report_"+string2+".pdf"; + filePath = new File(targetPdf); + + try { + document.writeTo(new FileOutputStream(filePath)); + } catch (IOException e) { + Log.e("main", "error "+e.toString()); + } + // filePath= new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"Report_"+string2+".pdf"); + + + // close the document + document.close(); + + } + + } \ No newline at end of file diff --git a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Test_details.java b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Test_details.java index f13ddd6..95b47ad 100644 --- a/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Test_details.java +++ b/app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Test_details.java @@ -1,10 +1,14 @@ package com.ShanMukhaInnovations.ArrestTB; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import android.Manifest; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; @@ -14,11 +18,14 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; import android.widget.Spinner; +import android.widget.Toast; public class Test_details extends Navigation_Top implements AdapterView.OnItemSelectedListener { Button btnTest; EditText NIRTLabd,SPINTubeIDd; String NIRTLabde,SPINTubeIDde,validatyd,sampled; + int PERMISSION_ALL = 1; + @Override protected void onCreate(Bundle savedInstanceState) { @@ -41,48 +48,60 @@ public class Test_details extends Navigation_Top implements AdapterView.OnItemSe btnTest.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - NIRTLabde=NIRTLabd.getText().toString(); - SPINTubeIDde= SPINTubeIDd.getText().toString(); + NIRTLabde = NIRTLabd.getText().toString(); + SPINTubeIDde = SPINTubeIDd.getText().toString(); + if (NIRTLabde.equals("") || SPINTubeIDde.equals("") || sampled.equals("")) { + Toast.makeText(Test_details.this, "Please fill all fields", Toast.LENGTH_SHORT).show(); + + } else { + if(ContextCompat.checkSelfPermission(Test_details.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED) + { + + ActivityCompat.requestPermissions(Test_details.this,new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},23); + + // MY_PERMISSIONS_REQUEST_READ_CONTACTS is an + // app-defined int constant + + return; + } + + + SharedPreferences preferences = getSharedPreferences("PhoneBook1", MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); + + editor.putString("NIRTLabde", NIRTLabde); + editor.putString("SPINTubeIDde", SPINTubeIDde); + editor.putString("sample", sampled); + editor.putString("validity", validatyd); - SharedPreferences preferences=getSharedPreferences("PhoneBook1",MODE_PRIVATE); - SharedPreferences.Editor editor=preferences.edit(); + editor.commit(); - editor.putString("NIRTLabde", NIRTLabde); - editor.putString("SPINTubeIDde", SPINTubeIDde); - editor.putString("sample", sampled); - editor.putString("validity", validatyd); + if (restorePrefData()) { + Intent intent = new Intent(getApplicationContext(), AddImage.class); + startActivity(intent); + finish(); - editor.commit(); - if (restorePrefData()) { + } else { - Intent intent = new Intent(getApplicationContext(),AddImage.class ); + Intent intent = new Intent(getApplicationContext(), Camera_Guide.class); + + startActivity(intent); + finish(); - startActivity( intent); - finish(); + } } - else - { - Intent intent = new Intent(getApplicationContext(),Camera_Guide.class ); - - startActivity(intent); - finish(); - - - } - - } }); ArrayAdapter sample_adapter = ArrayAdapter.createFromResource(this, @@ -139,4 +158,5 @@ public class Test_details extends Navigation_Top implements AdapterView.OnItemSe public void onNothingSelected(AdapterView parent) { } + } diff --git a/app/src/main/res/drawable-hdpi/sample1.png b/app/src/main/res/drawable-hdpi/sample1.png new file mode 100644 index 0000000..078c0e2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/sample1.png differ diff --git a/app/src/main/res/drawable-hdpi/shanmukha_logo_small.png b/app/src/main/res/drawable-hdpi/shanmukha_logo_small.png new file mode 100644 index 0000000..0215f9a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/shanmukha_logo_small.png differ diff --git a/app/src/main/res/drawable-ldpi/sample1.png b/app/src/main/res/drawable-ldpi/sample1.png new file mode 100644 index 0000000..5cb9527 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/sample1.png differ diff --git a/app/src/main/res/drawable-ldpi/shanmukha_logo_small.png b/app/src/main/res/drawable-ldpi/shanmukha_logo_small.png new file mode 100644 index 0000000..8f665a7 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/shanmukha_logo_small.png differ diff --git a/app/src/main/res/drawable-mdpi/sample1.png b/app/src/main/res/drawable-mdpi/sample1.png new file mode 100644 index 0000000..26984e7 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/sample1.png differ diff --git a/app/src/main/res/drawable-mdpi/shanmukha_logo_small.png b/app/src/main/res/drawable-mdpi/shanmukha_logo_small.png new file mode 100644 index 0000000..b73c184 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/shanmukha_logo_small.png differ diff --git a/app/src/main/res/drawable-xhdpi/sample1.png b/app/src/main/res/drawable-xhdpi/sample1.png new file mode 100644 index 0000000..a2a1a77 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sample1.png differ diff --git a/app/src/main/res/drawable-xhdpi/shanmukha_logo_small.png b/app/src/main/res/drawable-xhdpi/shanmukha_logo_small.png new file mode 100644 index 0000000..c89f50e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/shanmukha_logo_small.png differ diff --git a/app/src/main/res/drawable-xxhdpi/sample1.png b/app/src/main/res/drawable-xxhdpi/sample1.png new file mode 100644 index 0000000..9b0ee5e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sample1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/shanmukha_logo_small.png b/app/src/main/res/drawable-xxhdpi/shanmukha_logo_small.png new file mode 100644 index 0000000..14955c7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/shanmukha_logo_small.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/sample1.png b/app/src/main/res/drawable-xxxhdpi/sample1.png new file mode 100644 index 0000000..aa7c0b5 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/sample1.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/shanmukha_logo_small.png b/app/src/main/res/drawable-xxxhdpi/shanmukha_logo_small.png new file mode 100644 index 0000000..ba5bdf7 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/shanmukha_logo_small.png differ diff --git a/app/src/main/res/drawable/sample1.jpg b/app/src/main/res/drawable/sample1.jpg deleted file mode 100644 index c0226bc..0000000 Binary files a/app/src/main/res/drawable/sample1.jpg and /dev/null differ diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 754131d..d84b821 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,70 +1,246 @@ - - + > + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_add_image.xml b/app/src/main/res/layout/activity_add_image.xml index f14440e..53974d3 100644 --- a/app/src/main/res/layout/activity_add_image.xml +++ b/app/src/main/res/layout/activity_add_image.xml @@ -1,53 +1,66 @@ + > + - - -