diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b73660a..b589d56 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7fb21ed..3ff393f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,21 @@ + + + - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ac85c57..6626f3f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,19 +7,19 @@ android { compileSdk 32 defaultConfig { - applicationId "com.example.chatcom" + applicationId 'com.psmforums.chatcom' minSdk 21 targetSdk 32 versionCode 1 versionName '0.0.1' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + signingConfig signingConfigs.debug } buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + debug { + signingConfig signingConfigs.debug } } compileOptions { @@ -29,6 +29,8 @@ android { kotlinOptions { jvmTarget = '1.8' } + buildToolsVersion '32.0.0' + ndkVersion '23.1.7779620' } dependencies { @@ -38,7 +40,7 @@ dependencies { implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - testImplementation 'junit:junit:4.+' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } \ No newline at end of file diff --git a/app/src/main/java/com/example/chatcom/MainActivity.kt b/app/src/main/java/com/example/chatcom/MainActivity.kt index db68e63..414ac45 100644 --- a/app/src/main/java/com/example/chatcom/MainActivity.kt +++ b/app/src/main/java/com/example/chatcom/MainActivity.kt @@ -8,34 +8,41 @@ import androidx.fragment.app.FragmentActivity import androidx.viewpager.widget.PagerAdapter import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.widget.ViewPager2 +import com.example.chatcom.mainScreens.Chats +import com.example.chatcom.mainScreens.Contacts +import com.example.chatcom.mainScreens.Settings import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator class MainActivity : AppCompatActivity() { + private lateinit var viewPager2: ViewPager2 private lateinit var tabLayout : TabLayout private lateinit var toolbar: androidx.appcompat.widget.Toolbar private lateinit var appPagerAdapter: AppPagerAdapter private var titles = arrayListOf("Chats","Contacts","Settings") + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + toolbar = findViewById(R.id.toolbarMain) tabLayout = findViewById(R.id.tabLayoutMain) viewPager2 = findViewById(R.id.viewPager2Main) toolbar.title = "ChatCom" + setSupportActionBar(toolbar) + appPagerAdapter = AppPagerAdapter( this) viewPager2.adapter = appPagerAdapter + TabLayoutMediator(tabLayout,viewPager2){ tab,position-> tab.text = titles[position] }.attach() - - } - class AppPagerAdapter(fragmentActivity: FragmentActivity):FragmentStateAdapter(fragmentActivity) - { + + class AppPagerAdapter(fragmentActivity: FragmentActivity):FragmentStateAdapter(fragmentActivity) { override fun getItemCount(): Int { return 3 } @@ -43,13 +50,12 @@ class MainActivity : AppCompatActivity() { override fun createFragment(position: Int): Fragment { return when(position) { - 0->Chats() - 2->Contacts() - 3->Settings() + 0-> Chats() + 2-> Contacts() + 3-> Settings() else -> Chats() } } - } } \ No newline at end of file diff --git a/app/src/main/java/com/example/chatcom/Chats.kt b/app/src/main/java/com/example/chatcom/mainScreens/Chats.kt similarity index 96% rename from app/src/main/java/com/example/chatcom/Chats.kt rename to app/src/main/java/com/example/chatcom/mainScreens/Chats.kt index 0c8714a..193ae80 100644 --- a/app/src/main/java/com/example/chatcom/Chats.kt +++ b/app/src/main/java/com/example/chatcom/mainScreens/Chats.kt @@ -1,10 +1,11 @@ -package com.example.chatcom +package com.example.chatcom.mainScreens import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import com.example.chatcom.R // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER diff --git a/app/src/main/java/com/example/chatcom/Contacts.kt b/app/src/main/java/com/example/chatcom/mainScreens/Contacts.kt similarity index 96% rename from app/src/main/java/com/example/chatcom/Contacts.kt rename to app/src/main/java/com/example/chatcom/mainScreens/Contacts.kt index b1c72f9..b08afde 100644 --- a/app/src/main/java/com/example/chatcom/Contacts.kt +++ b/app/src/main/java/com/example/chatcom/mainScreens/Contacts.kt @@ -1,10 +1,11 @@ -package com.example.chatcom +package com.example.chatcom.mainScreens import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import com.example.chatcom.R // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER diff --git a/app/src/main/java/com/example/chatcom/Settings.kt b/app/src/main/java/com/example/chatcom/mainScreens/Settings.kt similarity index 96% rename from app/src/main/java/com/example/chatcom/Settings.kt rename to app/src/main/java/com/example/chatcom/mainScreens/Settings.kt index 18a83b9..fc69c52 100644 --- a/app/src/main/java/com/example/chatcom/Settings.kt +++ b/app/src/main/java/com/example/chatcom/mainScreens/Settings.kt @@ -1,10 +1,11 @@ -package com.example.chatcom +package com.example.chatcom.mainScreens import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import com.example.chatcom.R // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER diff --git a/app/src/main/res/layout/fragment_chats.xml b/app/src/main/res/layout/fragment_chats.xml index 0ec44bd..b474d58 100644 --- a/app/src/main/res/layout/fragment_chats.xml +++ b/app/src/main/res/layout/fragment_chats.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".Chats"> + tools:context=".mainScreens.Chats"> + tools:context=".mainScreens.Contacts"> + tools:context=".mainScreens.Settings">