Skip to content

Commit 341e8c6

Browse files
committed
updated search_bar, task adding activity, toolbar, ui
1 parent ff38c49 commit 341e8c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1077
-960
lines changed

.idea/.name

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetDropDown.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
buildToolsVersion "30.0.3"
1212

1313
defaultConfig {
14-
applicationId "com.masai.TickTask"
14+
applicationId "com.bhavesh.ticktask"
1515
minSdkVersion 22
1616
targetSdkVersion 30
1717
versionCode 4

app/google-services.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"client_info": {
1010
"mobilesdk_app_id": "1:629050584616:android:e6495a29de6bee83364f1d",
1111
"android_client_info": {
12-
"package_name": "com.masai.TickTask"
12+
"package_name": "com.bhavesh.ticktask"
1313
}
1414
},
1515
"oauth_client": [
1616
{
1717
"client_id": "629050584616-g232q590n9940bmbnu75ci8b94a686mu.apps.googleusercontent.com",
1818
"client_type": 1,
1919
"android_info": {
20-
"package_name": "com.masai.TickTask",
20+
"package_name": "com.bhavesh.ticktask",
2121
"certificate_hash": "0039e88458390306b8b1203475c9e82a93c86bee"
2222
}
2323
},
@@ -46,15 +46,15 @@
4646
"client_info": {
4747
"mobilesdk_app_id": "1:629050584616:android:9798ee647bd1d08a364f1d",
4848
"android_client_info": {
49-
"package_name": "com.masai.myjournalapp"
49+
"package_name": "com.bhavesh.ticktask"
5050
}
5151
},
5252
"oauth_client": [
5353
{
5454
"client_id": "629050584616-7kn1468k8p7j5npkt87g4nmk2i39qmvg.apps.googleusercontent.com",
5555
"client_type": 1,
5656
"android_info": {
57-
"package_name": "com.masai.myjournalapp",
57+
"package_name": "com.bhavesh.TickTask",
5858
"certificate_hash": "0039e88458390306b8b1203475c9e82a93c86bee"
5959
}
6060
},

app/src/androidTest/java/com/masai/TickTask/ExampleInstrumentedTest.kt renamed to app/src/androidTest/java/com/bhavesh/ticktask/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.masai.TickTask
1+
package com.bhavesh.ticktask
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
1919
fun useAppContext() {
2020
// Context of the app under test.
2121
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22-
assertEquals("com.masai.TickTask", appContext.packageName)
22+
assertEquals("com.bhavesh.ticktask", appContext.packageName)
2323
}
2424
}

app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.masai.TickTask">
3+
package="com.bhavesh.ticktask" >
44

55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -11,23 +11,24 @@
1111
android:label="@string/app_name"
1212
android:roundIcon="@mipmap/ic_launcher_round"
1313
android:supportsRtl="true"
14-
android:theme="@style/Theme.TickTask">
14+
android:theme="@style/Theme.TickTask" >
1515
<activity
16-
android:name=".Views.SettingActivity"
16+
android:name="com.bhavesh.ticktask.ui.AddTaskActivity"
17+
android:launchMode="singleTask"
1718
android:exported="true" />
1819
<activity
19-
android:name=".Views.NotificationMessage"
20+
android:name="com.bhavesh.ticktask.ui.NotificationMessage"
2021
android:exported="true" />
2122
<activity
22-
android:name=".Views.LoginScreen.RegisterActivity"
23+
android:name="com.bhavesh.ticktask.ui.loginScreen.RegisterActivity"
2324
android:exported="true" />
2425
<activity
25-
android:name=".Views.WelcomeActivity"
26+
android:name="com.bhavesh.ticktask.ui.WelcomeActivity"
2627
android:exported="true" />
2728
<activity
28-
android:name=".Views.LoginScreen.LoginActivity"
29+
android:name="com.bhavesh.ticktask.ui.loginScreen.LoginActivity"
2930
android:exported="true" />
30-
<activity android:name=".Views.MainActivity">
31+
<activity android:name="com.bhavesh.ticktask.ui.MainActivity" >
3132
<intent-filter>
3233
<action android:name="android.intent.action.MAIN" />
3334

@@ -39,7 +40,7 @@
3940
android:name="preloaded_fonts"
4041
android:resource="@array/preloaded_fonts" />
4142

42-
<receiver android:name=".notification.NotificationBroadcast" />
43+
<receiver android:name="com.bhavesh.ticktask.notification.NotificationBroadcast" />
4344
</application>
4445

4546
</manifest>

app/src/main/java/com/masai/TickTask/data/DatabaseHandler/DatabaseHandler.kt renamed to app/src/main/java/com/bhavesh/ticktask/data/databaseHandler/DatabaseHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.masai.TickTask.data.DatabaseHandler
1+
package com.bhavesh.ticktask.data.databaseHandler
22

33
import android.content.ContentValues
44
import android.content.Context
55
import android.database.sqlite.SQLiteDatabase
66
import android.database.sqlite.SQLiteOpenHelper
77
import android.widget.Toast
8-
import com.masai.TickTask.data.Model.RoutineModel
8+
import com.bhavesh.ticktask.data.model.RoutineModel
99

1010
class DatabaseHandler(val context: Context) :
1111
SQLiteOpenHelper(context, "journal.db", null, 1) {

app/src/main/java/com/masai/TickTask/data/Model/RoutineModel.kt renamed to app/src/main/java/com/bhavesh/ticktask/data/model/RoutineModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.masai.TickTask.data.Model
1+
package com.bhavesh.ticktask.data.model
22

33
import androidx.room.ColumnInfo
44
import androidx.room.Entity

0 commit comments

Comments
 (0)